[Emacs-diffs] /srv/bzr/emacs/trunk r101061: Shut up compiler warnings due to "char *" and "const char *".

[Eli Zaretskii]

------------------------------------------------------------
revno: 101061
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-13 11:10:05 +0300
message:
  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 *".
modified:
  src/ChangeLog
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-12 14:44:16 +0000
+++ b/src/ChangeLog     2010-08-13 08:10:05 +0000
@@ -1,3 +1,8 @@
+2010-08-13  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        Introduce a new comment style "c" flag.

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2010-08-11 12:34:46 +0000
+++ b/src/w32menu.c     2010-08-13 08:10:05 +0000
@@ -1280,9 +1280,9 @@
 
 /* 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 @@
          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.  */