aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-03-12 12:51:31 +0200
committerEli Zaretskii2011-03-12 12:51:31 +0200
commit7ac80be95aaa92eacb454d4fa6aa3d2f56058978 (patch)
tree9f83b16d116b5cc778532c819ec81db1ababec82 /src
parenta276370e0a8c9434ce0ae2ba72fa6acd69570a0d (diff)
downloademacs-7ac80be95aaa92eacb454d4fa6aa3d2f56058978.tar.gz
emacs-7ac80be95aaa92eacb454d4fa6aa3d2f56058978.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/msdos.c6
-rw-r--r--src/msdos.h2
3 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b54abe08dd..8534c3b455f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12011-03-12 Eli Zaretskii <eliz@gnu.org>
2
3 * msdos.c (XMenuAddPane): 3rd argument is `const char *' now.
4 Adapt all references accordingly.
5
6 * msdos.h (XMenuAddPane): 3rd argument is `const char *' now.
7
12011-03-11 Tom Tromey <tromey@redhat.com> 82011-03-11 Tom Tromey <tromey@redhat.com>
2 9
3 * buffer.c (syms_of_buffer): Remove obsolete comment. 10 * buffer.c (syms_of_buffer): Remove obsolete comment.
diff --git a/src/msdos.c b/src/msdos.c
index 5d50749cb7e..b0bf5c4fdd9 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2999,17 +2999,17 @@ XMenuCreate (Display *foo1, Window foo2, char *foo3)
2999 to do. */ 2999 to do. */
3000 3000
3001int 3001int
3002XMenuAddPane (Display *foo, XMenu *menu, char *txt, int enable) 3002XMenuAddPane (Display *foo, XMenu *menu, const char *txt, int enable)
3003{ 3003{
3004 int len; 3004 int len;
3005 char *p; 3005 const char *p;
3006 3006
3007 if (!enable) 3007 if (!enable)
3008 abort (); 3008 abort ();
3009 3009
3010 IT_menu_make_room (menu); 3010 IT_menu_make_room (menu);
3011 menu->submenu[menu->count] = IT_menu_create (); 3011 menu->submenu[menu->count] = IT_menu_create ();
3012 menu->text[menu->count] = txt; 3012 menu->text[menu->count] = (char *)txt;
3013 menu->panenumber[menu->count] = ++menu->panecount; 3013 menu->panenumber[menu->count] = ++menu->panecount;
3014 menu->help_text[menu->count] = NULL; 3014 menu->help_text[menu->count] = NULL;
3015 menu->count++; 3015 menu->count++;
diff --git a/src/msdos.h b/src/msdos.h
index 4bbe9b134de..5051f2f3837 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -105,7 +105,7 @@ typedef struct x_menu_struct
105} XMenu; 105} XMenu;
106 106
107XMenu *XMenuCreate (Display *, Window, char *); 107XMenu *XMenuCreate (Display *, Window, char *);
108int XMenuAddPane (Display *, XMenu *, char *, int); 108int XMenuAddPane (Display *, XMenu *, const char *, int);
109int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *); 109int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *);
110void XMenuLocate (Display *, XMenu *, int, int, int, int, 110void XMenuLocate (Display *, XMenu *, int, int, int, int,
111 int *, int *, int *, int *); 111 int *, int *, int *, int *);