Shut up compiler warnings due to "char *" and "const char *".

 w32menu.c (add_menu_item): Use explicit cast to "char *".
 (name_is_separator): Make `name' and `start' be "const char *".

diff --git a/src/ChangeLog b/src/ChangeLog
index 14213e1c7501f76d0ce3b12ada9e935f2b92b6c5..9c004656124e99ab652cbc2a81e859d74f146e3a 100644 (file)
--- 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 bd560219a1d26c8385c5142338272df4aaa227c4..0aaca5e234eefa6d3cfa3a58c523c57e167ab527 100644 (file)
--- 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.  */