Merge from trunk.

[gnu-emacs] / src / w32menu.c

diff --git a/src/w32menu.c b/src/w32menu.c
index 9091cb816276ad7c498b9b3663c676e60b1316b7..dd741a01b5b15989b4a57ec5d50978920919764b 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -381,7 +381,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
 
       struct buffer *prev = current_buffer;
       Lisp_Object buffer;
-      int specpdl_count = SPECPDL_INDEX ();
+      ptrdiff_t specpdl_count = SPECPDL_INDEX ();
       int previous_menu_items_used = f->menu_bar_items_used;
       Lisp_Object *previous_items
        = (Lisp_Object *) alloca (previous_menu_items_used