* xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of timestamp argument.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4f6990ba2c81942a17e7b84e237e8663fecb01bd..c2f8c596ed949f213c3a645d329e8f7c2f1979a3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of
+       timestamp argument.
+
 2010-07-15  Eli Zaretskii  <eliz@gnu.org>
 
        * fringe.c (update_window_fringes): Restore mistakenly reverted

diff --git a/src/xmenu.c b/src/xmenu.c
index 4b99297e772348291699aa4c46486042b1decf73..8da68c6d87653892319d1dc08b091cff9469b88c 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1562,7 +1562,8 @@ pop_down_menu (Lisp_Object arg)
    menu pops down.
    menu_item_selection will be set to the selection.  */
 static void
-create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, int for_click, unsigned int timestamp)
+create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
+                           int x, int y, int for_click, EMACS_UINT timestamp)
 {
   int i;
   Arg av[2];
@@ -2275,7 +2276,8 @@ pop_down_menu (Lisp_Object arg)
 
 
 Lisp_Object
-xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, char **error, unsigned int timestamp)
+xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
+           Lisp_Object title, char **error, EMACS_UINT timestamp)
 {
   Window root;
   XMenu *menu;