Fix compilation error in xmenu.c for non-toolkit builds.

 xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument list
 to be consistent with menu.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c004656124e99ab652cbc2a81e859d74f146e3a..448ce3745c375888f1d1352d4855338cfb98b222 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-13  Eli Zaretskii  <eliz@gnu.org>
 
+       * xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument
+       list to be consistent with menu.h.
+
        * w32menu.c (add_menu_item, name_is_separator): Shut up compiler
        warnings due to mixing of "char *" and "const char *".
 

diff --git a/src/xmenu.c b/src/xmenu.c
index 0f42a5f0892be3924ef18357bfd18187c9f6f2a7..68b442388a56b44fa3de4326cec6bc2e3770f743 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2243,7 +2243,7 @@ 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, EMACS_UINT timestamp)
+           Lisp_Object title, const char **error, EMACS_UINT timestamp)
 {
   Window root;
   XMenu *menu;