* frame.h (struct frame): Use int for menu_bar_items_used

instead of EMACS_INT, since it always fits in int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3bdf5129da9340972a0222ac2707e3f061d26dc1..42c913990953559b53e2f0946ace367321236597 100644 (file)
--- 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 e73370340f1887ffb07226d9aa289dad24de92d3..db57b1be9801b3df2e56df84c2d15d0a56db183b 100644 (file)
--- 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.  */