2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 14213e1c750..9c004656124 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32menu.c (add_menu_item, name_is_separator): Shut up compiler
+        warnings due to mixing of "char *" and "const char *".
+
 2010-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         Introduce a new comment style "c" flag.
diff --git a/src/w32menu.c b/src/w32menu.c
index bd560219a1d..0aaca5e234e 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1280,9 +1280,9 @@ simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header)
 
 /* Is this item a separator? */
 static int
-name_is_separator (char *name)
+name_is_separator (const char *name)
 {
-  char *start = name;
+  const char *start = name;
 
   /* Check if name string consists of only dashes ('-').  */
   while (*name == '-') name++;
@@ -1360,7 +1360,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
           strcat (out_string, wv->key);
         }
       else
-        out_string = wv->name;
+        out_string = (char *)wv->name;
 
       /* Quote any special characters within the menu item's text and
          key binding.  */