Fix compilation warnings on MS-DOS due to constifying of pointers in xmenu.c.

 src/msdos.c (XMenuAddPane): 3rd argument is `const char *' now.
 Adapt all references accordingly.
 src/msdos.h (XMenuAddPane): 3rd argument is `const char *' now.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b54abe08ddf40ecd3bc6ec7ee6cbb150c3e527f..8534c3b455f17700992544ca434aa3ed05ab20d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-12  Eli Zaretskii  <eliz@gnu.org>
+
+       * msdos.c (XMenuAddPane): 3rd argument is `const char *' now.
+       Adapt all references accordingly.
+
+       * msdos.h (XMenuAddPane): 3rd argument is `const char *' now.
+
 2011-03-11  Tom Tromey  <tromey@redhat.com>
 
        * buffer.c (syms_of_buffer): Remove obsolete comment.

diff --git a/src/msdos.c b/src/msdos.c
index 5d50749cb7ebbc42552ca700b52d606073440fe3..b0bf5c4fdd9e719c11347f45fbbe9112fe830ca2 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2999,17 +2999,17 @@ XMenuCreate (Display *foo1, Window foo2, char *foo3)
    to do.  */
 
 int
-XMenuAddPane (Display *foo, XMenu *menu, char *txt, int enable)
+XMenuAddPane (Display *foo, XMenu *menu, const char *txt, int enable)
 {
   int len;
-  char *p;
+  const char *p;
 
   if (!enable)
     abort ();
 
   IT_menu_make_room (menu);
   menu->submenu[menu->count] = IT_menu_create ();
-  menu->text[menu->count] = txt;
+  menu->text[menu->count] = (char *)txt;
   menu->panenumber[menu->count] = ++menu->panecount;
   menu->help_text[menu->count] = NULL;
   menu->count++;

diff --git a/src/msdos.h b/src/msdos.h
index 4bbe9b134de33e00ee79d76dc613373a1d4df57e..5051f2f38378b59c8fefbd3c2cec10e44b847ece 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -105,7 +105,7 @@ typedef struct x_menu_struct
 } XMenu;
 
 XMenu *XMenuCreate (Display *, Window, char *);
-int XMenuAddPane (Display *, XMenu *, char *, int);
+int XMenuAddPane (Display *, XMenu *, const char *, int);
 int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *);
 void XMenuLocate (Display *, XMenu *, int, int, int, int,
                  int *, int *, int *, int *);