Mercurial > emacs
changeset 109760:0217a9452703
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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 13 Aug 2010 11:32:13 +0300 |
| parents | 779e72b463fd |
| children | 31def5db596a |
| files | src/ChangeLog src/xmenu.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 13 11:10:05 2010 +0300 +++ b/src/ChangeLog Fri Aug 13 11:32:13 2010 +0300 @@ -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 *".
--- a/src/xmenu.c Fri Aug 13 11:10:05 2010 +0300 +++ b/src/xmenu.c Fri Aug 13 11:32:13 2010 +0300 @@ -2243,7 +2243,7 @@ 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;