From 1b2de274591d07480256539c4be65299d1dde3e9 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 24 Apr 2011 15:48:30 +0300 Subject: [PATCH] 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. : 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 : Make extern again. src/syntax.c: Include sys/types.h before including regex.h, as required by Posix. --- msdos/ChangeLog | 6 ++++++ msdos/sedlibmk.inp | 18 +++++++++++++++++- src/ChangeLog | 15 +++++++++++++++ src/msdos.c | 10 +++++----- src/msdos.h | 8 ++++---- src/syntax.c | 2 ++ src/xfaces.c | 2 +- 7 files changed, 50 insertions(+), 11 deletions(-) diff --git a/msdos/ChangeLog b/msdos/ChangeLog index ebac5b288b6..5c345de5e35 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,9 @@ +2011-04-24 Eli Zaretskii + + * sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out + allocator.$(OBJEXT). Add editing for the new GNULIB_* and + REPLACE_* variables. + 2011-04-06 Eli Zaretskii * sedlibmk.inp: Update checklist. diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index df4dd7ddf75..92313b96421 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -36,7 +36,7 @@ # /^STDDEF_H *=/s/@[^@\n]*@// -- stddef.h is not needed # # . Some of the headers are generated conditionally, and the -# corresponding recipes are guarder by @GL_GENERATE_xxxx_H_TRUE@ +# corresponding recipes are guarded by @GL_GENERATE_xxxx_H_TRUE@ # and @GL_GENERATE_xxxx_H_FALSE@. Depending on whether DJGPP uses # the corresponding header, these should be edited either to # nothing (thus exposing the recipe) or to #, which comments the @@ -160,13 +160,17 @@ am__cd = cd /^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/ /^GNULIB_FCLOSE *=/s/@GNULIB_FCLOSE@/0/ /^GNULIB_FFLUSH *=/s/@GNULIB_FFLUSH@/0/ +/^GNULIB_FGETC *=/s/@GNULIB_FGETC@/0/ +/^GNULIB_FGETS *=/s/@GNULIB_FGETS@/0/ /^GNULIB_FOPEN *=/s/@GNULIB_FOPEN@/0/ /^GNULIB_FPRINTF *=/s/@GNULIB_FPRINTF@/0/ /^GNULIB_FPRINTF_POSIX *=/s/@GNULIB_FPRINTF_POSIX@/0/ /^GNULIB_FPURGE *=/s/@GNULIB_FPURGE@/0/ /^GNULIB_FPUTC *=/s/@GNULIB_FPUTC@/0/ /^GNULIB_FPUTS *=/s/@GNULIB_FPUTS@/0/ +/^GNULIB_FREAD *=/s/@GNULIB_FREAD@/0/ /^GNULIB_FREOPEN *=/s/@GNULIB_FREOPEN@/0/ +/^GNULIB_FSCANF *=/s/@GNULIB_FSCANF@/0/ /^GNULIB_FSEEK *=/s/@GNULIB_FSEEK@/0/ /^GNULIB_FSEEKO *=/s/@GNULIB_FSEEKO@/0/ /^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/ @@ -176,6 +180,8 @@ am__cd = cd /^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/ /^GNULIB_FUTIMENS *=/s/@GNULIB_FUTIMENS@/0/ /^GNULIB_FWRITE *=/s/@GNULIB_FWRITE@/0/ +/^GNULIB_GETC *=/s/@GNULIB_GETC@/0/ +/^GNULIB_GETCHAR *=/s/@GNULIB_GETCHAR@/0/ /^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/ /^GNULIB_GETDELIM *=/s/@GNULIB_GETDELIM@/0/ /^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/ @@ -187,6 +193,7 @@ am__cd = cd /^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/ /^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/ /^GNULIB_GETPAGESIZE *=/s/@GNULIB_GETPAGESIZE@/0/ +/^GNULIB_GETS *=/s/@GNULIB_GETS@/0/ /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/ /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/ /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/ @@ -226,6 +233,7 @@ am__cd = cd /^GNULIB_PUTS *=/s/@GNULIB_PUTS@/0/ /^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/ /^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/ +/^GNULIB_READ *=/s/@GNULIB_READ@/0/ /^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/ /^GNULIB_READLINKAT *=/s/@GNULIB_READLINKAT@/0/ /^GNULIB_REALLOC_POSIX *=/s/@GNULIB_REALLOC_POSIX@/0/ @@ -235,11 +243,13 @@ am__cd = cd /^GNULIB_RENAMEAT *=/s/@GNULIB_RENAMEAT@/0/ /^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/ /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/ +/^GNULIB_SCANF *=/s/@GNULIB_SCANF@/0/ /^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/ /^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/ /^GNULIB_SNPRINTF *=/s/@GNULIB_SNPRINTF@/0/ /^GNULIB_SPRINTF_POSIX *=/s/@GNULIB_SPRINTF_POSIX@/0/ /^GNULIB_STAT *=/s/@GNULIB_STAT@/0/ +/^GNULIB_STDIO_H_NONBLOCKING *=/s/@GNULIB_STDIO_H_NONBLOCKING@/0/ /^GNULIB_STDIO_H_SIGPIPE *=/s/@GNULIB_STDIO_H_SIGPIPE@/0/ /^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/ /^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/ @@ -253,6 +263,7 @@ am__cd = cd /^GNULIB_TMPFILE *=/s/@GNULIB_TMPFILE@/0/ /^GNULIB_TTYNAME_R *=/s/@GNULIB_TTYNAME_R@/0/ /^GNULIB_UNISTD_H_GETOPT *=/s/@GNULIB_UNISTD_H_GETOPT@/1/ +/^GNULIB_UNISTD_H_NONBLOCKING *=/s/@GNULIB_UNISTD_H_NONBLOCKING@/0/ /^GNULIB_UNISTD_H_SIGPIPE *=/s/@GNULIB_UNISTD_H_SIGPIPE@/0/ /^GNULIB_UNLINK *=/s/@GNULIB_UNLINK@/0/ /^GNULIB_UNLINKAT *=/s/@GNULIB_UNLINKAT@/0/ @@ -264,8 +275,10 @@ am__cd = cd /^GNULIB_VDPRINTF *=/s/@GNULIB_VDPRINTF@/0/ /^GNULIB_VFPRINTF *=/s/@GNULIB_VFPRINTF@/0/ /^GNULIB_VFPRINTF_POSIX *=/s/@GNULIB_VFPRINTF_POSIX@/0/ +/^GNULIB_VFSCANF *=/s/@GNULIB_VFSCANF@/0/ /^GNULIB_VPRINTF *=/s/@GNULIB_VPRINTF@/0/ /^GNULIB_VPRINTF_POSIX *=/s/@GNULIB_VPRINTF_POSIX@/0/ +/^GNULIB_VSCANF *=/s/@GNULIB_VSCANF@/0/ /^GNULIB_VSNPRINTF *=/s/@GNULIB_VSNPRINTF@/0/ /^GNULIB_VSPRINTF_POSIX *=/s/@GNULIB_VSPRINTF_POSIX@/0/ /^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/ @@ -457,6 +470,7 @@ am__cd = cd /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/ /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ +/^REPLACE_READ *=/s/@REPLACE_READ@/0/ /^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/ /^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/ /^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/ @@ -469,6 +483,7 @@ am__cd = cd /^REPLACE_SNPRINTF *=/s/@REPLACE_SNPRINTF@/0/ /^REPLACE_SPRINTF *=/s/@REPLACE_SPRINTF@/0/ /^REPLACE_STAT *=/s/@REPLACE_STAT@/0/ +/^REPLACE_STDIO_READ_FUNCS *=/s/@REPLACE_STDIO_READ_FUNCS@/0/ /^REPLACE_STDIO_WRITE_FUNCS *=/s/@REPLACE_STDIO_WRITE_FUNCS@/0/ /^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/ /^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/ @@ -501,6 +516,7 @@ am__cd = cd /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// /^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o/ /^am_libgnu_a_OBJECTS *=/s/careadlinkat.\$(OBJEXT)// +/^am_libgnu_a_OBJECTS *=/s/allocator.\$(OBJEXT)// /^srcdir *=/s/@[^@\n]*@/./ /^top_srcdir *=/s/@[^@\n]*@/../ /^top_builddir *=/s/@[^@\n]*@/../ diff --git a/src/ChangeLog b/src/ChangeLog index 478a5aa2512..7efd8dad6cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,20 @@ 2011-04-24 Eli Zaretskii + * msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list + to changes in oldXMenu/XMenu.h from 2011-04-16. + : Constify. + (IT_menu_make_room): menu->help_text is now `const char **'; + adjust. + + * msdos.h (XMenuActivate, XMenuAddSelection): Adjust prototypes + to changes in oldXMenu/XMenu.h from 2011-04-16. + (struct XMenu): Declare `help_text' `const char **'. + + * xfaces.c : Make extern again. + + * syntax.c: Include sys/types.h before including regex.h, as + required by Posix. + * doc.c (get_doc_string): Improve the format passed to `error'. * doprnt.c (doprnt): Improve commentary. diff --git a/src/msdos.c b/src/msdos.c index 6bff56b3f82..3dc586e42f5 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -2812,7 +2812,7 @@ dos_keyread (void) left), but I don't think it's worth the effort. */ /* These hold text of the current and the previous menu help messages. */ -static char *menu_help_message, *prev_menu_help_message; +static const char *menu_help_message, *prev_menu_help_message; /* Pane number and item number of the menu item which generated the last menu help message. */ static int menu_help_paneno, menu_help_itemno; @@ -2839,7 +2839,7 @@ IT_menu_make_room (XMenu *menu) menu->text = (char **) xmalloc (count * sizeof (char *)); menu->submenu = (XMenu **) xmalloc (count * sizeof (XMenu *)); menu->panenumber = (int *) xmalloc (count * sizeof (int)); - menu->help_text = (char **) xmalloc (count * sizeof (char *)); + menu->help_text = (const char **) xmalloc (count * sizeof (char *)); } else if (menu->allocated == menu->count) { @@ -2851,7 +2851,7 @@ IT_menu_make_room (XMenu *menu) menu->panenumber = (int *) xrealloc (menu->panenumber, count * sizeof (int)); menu->help_text - = (char **) xrealloc (menu->help_text, count * sizeof (char *)); + = (const char **) xrealloc (menu->help_text, count * sizeof (char *)); } } @@ -3033,7 +3033,7 @@ XMenuAddPane (Display *foo, XMenu *menu, const char *txt, int enable) int XMenuAddSelection (Display *bar, XMenu *menu, int pane, - int foo, char *txt, int enable, char *help_text) + int foo, char *txt, int enable, char const *help_text) { int len; char *p; @@ -3086,7 +3086,7 @@ struct IT_menu_state int XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, int x0, int y0, unsigned ButtonMask, char **txt, - void (*help_callback)(char *, int, int)) + void (*help_callback)(char const *, int, int)) { struct IT_menu_state *state; int statecount, x, y, i, b, screensize, leave, result, onepane; 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 */ diff --git a/src/syntax.c b/src/syntax.c index 4be6b8db140..9013a897dd0 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -19,7 +19,9 @@ along with GNU Emacs. If not, see . */ #include + #include +#include #include #include "lisp.h" #include "commands.h" diff --git a/src/xfaces.c b/src/xfaces.c index fbed183522a..8e68b05cd87 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -331,7 +331,7 @@ Lisp_Object Qexpanded; static Lisp_Object Qultra_expanded; static Lisp_Object Qreleased_button, Qpressed_button; static Lisp_Object QCstyle, QCcolor, QCline_width; -static Lisp_Object Qunspecified; +Lisp_Object Qunspecified; /* used in dosfns.c */ static Lisp_Object Qignore_defface; char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; -- 2.39.2