aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-13 11:32:13 +0300
committerEli Zaretskii2010-08-13 11:32:13 +0300
commit38e41e0e7878499325a609c8e6d30cd3acda3376 (patch)
tree7c05f45aa028bdf0d01401ebee358e6476a408c5
parent94c97d853fee699c2cc044b2d146efaafef5a480 (diff)
downloademacs-38e41e0e7878499325a609c8e6d30cd3acda3376.tar.gz
emacs-38e41e0e7878499325a609c8e6d30cd3acda3376.zip
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.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xmenu.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9c004656124..448ce3745c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12010-08-13 Eli Zaretskii <eliz@gnu.org> 12010-08-13 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument
4 list to be consistent with menu.h.
5
3 * w32menu.c (add_menu_item, name_is_separator): Shut up compiler 6 * w32menu.c (add_menu_item, name_is_separator): Shut up compiler
4 warnings due to mixing of "char *" and "const char *". 7 warnings due to mixing of "char *" and "const char *".
5 8
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)
2243 2243
2244Lisp_Object 2244Lisp_Object
2245xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, 2245xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
2246 Lisp_Object title, char **error, EMACS_UINT timestamp) 2246 Lisp_Object title, const char **error, EMACS_UINT timestamp)
2247{ 2247{
2248 Window root; 2248 Window root;
2249 XMenu *menu; 2249 XMenu *menu;