From 38e41e0e7878499325a609c8e6d30cd3acda3376 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 13 Aug 2010 11:32:13 +0300 Subject: [PATCH] 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. --- src/ChangeLog | 3 +++ src/xmenu.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 + * 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; -- 2.39.2