From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Mon, 25 Jun 2012 04:05:48 +0000 (+0400)
Subject: * xmenu.c (xmenu_show, xdialog_show): Explicit cast from
X-Git-Tag: emacs-24.2.90~1199^2~358
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b00876c993de49c79af45f8b92b18baa545940f7;p=emacs.git

* xmenu.c (xmenu_show, xdialog_show): Explicit cast from
`const char *' to `char *' to avoid compiler warning.
---

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;