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

2b23d2a6 · Andreas Schwab · c4affd2c · 2b23d2a6 · 2b23d2a6
Commit 2b23d2a6 authored Jul 15, 2010 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/xmenu.c src/xmenu.c +4 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- 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;