From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 13 Aug 2010 08:32:13 +0000 (+0300)
Subject: Fix compilation error in xmenu.c for non-toolkit builds.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~307^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38e41e0e7878499325a609c8e6d30cd3acda3376;p=emacs.git

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 9c004656124..448ce3745c3 100644
--- 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 0f42a5f0892..68b442388a5 100644
--- 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;