diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xmenu.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7878a4d6f68..b8051d13680 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-06-25 Dmitry Antipov <dmantipov@yandex.ru> + + * xmenu.c (xmenu_show, xdialog_show): Explicit cast from + `const char *' to `char *' to avoid compiler warning. + 2012-06-24 Paul Eggert <eggert@cs.ucla.edu> * xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string diff --git a/src/xmenu.c b/src/xmenu.c index 98b71b15f05..ad2ebc09128 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1729,7 +1729,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, save_wv->next = wv; else first_wv->contents = wv; - wv->name = pane_string; + wv->name = (char *) pane_string; if (keymaps && !NILP (prefix)) wv->name++; wv->value = 0; @@ -2060,7 +2060,7 @@ xdialog_show (FRAME_PTR f, pane_string = (NILP (pane_name) ? "" : SSDATA (pane_name)); prev_wv = xmalloc_widget_value (); - prev_wv->value = pane_string; + prev_wv->value = (char *) pane_string; if (keymaps && !NILP (prefix)) prev_wv->name++; prev_wv->enabled = 1; |