From d230cb74b5a1f6bb8d340e11ca1a661e5ce6a7ae Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 12 May 2011 09:25:30 -0700 Subject: [PATCH] * frame.h (struct frame): Use int for menu_bar_items_used instead of EMACS_INT, since it always fits in int. --- src/ChangeLog | 2 ++ src/frame.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3bdf5129da9..42c91399095 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,8 @@ * xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes that always fit in int. Use a sentinel instead of a counter, to avoid a temp and to allay GCC's concerns about possible int overflow. + * frame.h (struct frame): Use int for menu_bar_items_used + instead of EMACS_INT, since it always fits in int. * menu.c (grow_menu_items): Check for int overflow. diff --git a/src/frame.h b/src/frame.h index e73370340f1..db57b1be980 100644 --- a/src/frame.h +++ b/src/frame.h @@ -192,7 +192,7 @@ struct frame struct face_cache *face_cache; /* Number of elements in `menu_bar_vector' that have meaningful data. */ - EMACS_INT menu_bar_items_used; + int menu_bar_items_used; /* A buffer to hold the frame's name. We can't use the Lisp string's pointer (`name', above) because it might get relocated. */ -- 2.39.2