From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 15 Jul 2010 21:53:32 +0000 (+0200)
Subject: * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of timestamp argument.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b23d2a6b11385b571eeac64f3c1b0e8d194823c;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4f6990ba2c8..c2f8c596ed9 100644
--- 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 4b99297e772..8da68c6d876 100644
--- 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;