Commit d230cb74 authored by Paul Eggert's avatar Paul Eggert

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

instead of EMACS_INT, since it always fits in int.
parent 3e26f69c
......@@ -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.
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment