diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-04-24 15:48:30 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-04-24 15:48:30 +0300 |
| commit | 1b2de274591d07480256539c4be65299d1dde3e9 (patch) | |
| tree | aa92b53c0827f7467b2b64c675b682290c06b380 /src/msdos.h | |
| parent | 762b15be8c7925c661e839fa41d46189513dfda6 (diff) | |
| download | emacs-1b2de274591d07480256539c4be65299d1dde3e9.tar.gz | |
Repair the MSDOS build following latest changes.
msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out
allocator.$(OBJEXT). Add editing for the new GNULIB_* and
REPLACE_* variables.
src/msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list
to changes in oldXMenu/XMenu.h from 2011-04-16.
<menu_help_message, prev_menu_help_message>: Constify.
(IT_menu_make_room): menu->help_text is now `const char **';
adjust.
src/msdos.h (XMenuActivate, XMenuAddSelection): Adjust prototypes
to changes in oldXMenu/XMenu.h from 2011-04-16.
(struct XMenu): Declare `help_text' `const char **'.
src/xfaces.c <Qunspecified>: Make extern again.
src/syntax.c: Include sys/types.h before including regex.h, as
required by Posix.
Diffstat (limited to 'src/msdos.h')
| -rw-r--r-- | src/msdos.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/msdos.h b/src/msdos.h index 5051f2f3837..3048b5f7e35 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -101,16 +101,16 @@ typedef struct x_menu_struct int allocated; int panecount; int width; - char **help_text; + const char **help_text; } XMenu; XMenu *XMenuCreate (Display *, Window, char *); -int XMenuAddPane (Display *, XMenu *, const char *, int); -int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *); +int XMenuAddPane (Display *, XMenu *, char const *, int); +int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char const *); void XMenuLocate (Display *, XMenu *, int, int, int, int, int *, int *, int *, int *); int XMenuActivate (Display *, XMenu *, int *, int *, int, int, unsigned, - char **, void (*callback)(char *, int, int)); + char **, void (*callback)(char const *, int, int)); void XMenuDestroy (Display *, XMenu *); #endif /* not HAVE_X_WINDOWS */ |