1 files changed, 2 insertions, 0 deletions
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/ChangeLog b/src/ChangeLog index 3bdf5129da9..42c91399095 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3	* xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes	3	* xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes
4	that always fit in int. Use a sentinel instead of a counter, to	4	that always fit in int. Use a sentinel instead of a counter, to
5	avoid a temp and to allay GCC's concerns about possible int overflow.	5	avoid a temp and to allay GCC's concerns about possible int overflow.
		6	* frame.h (struct frame): Use int for menu_bar_items_used
		7	instead of EMACS_INT, since it always fits in int.
6		8
7	* menu.c (grow_menu_items): Check for int overflow.	9	* menu.c (grow_menu_items): Check for int overflow.
8		10