From 75c0d28a6a89e31172e2533ef9638c75af02dada Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 May 2011 13:24:55 +0300 Subject: [PATCH] Adapt MS-DOS configury to latest changes. msdos/inttypes.h: Include stdint.h. (uintmax_t): Don't define, it is defined in stdint.h. msdos/sedlibmk.inp (am__append_1): Edit to comment out. (am__append_2): Edit to expose. (NEXT_AS_FIRST_DIRECTIVE_STDARG_H, NEXT_STDARG_H, STDARG_H): Edit to empty. (@GL_GENERATE_STDARG_H_TRUE@, @GL_GENERATE_STDARG_H_FALSE@): Edit to comment out corresponding lines. --- msdos/ChangeLog | 12 ++++++++++++ msdos/inttypes.h | 6 +++++- msdos/sedlibmk.inp | 9 ++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 5e793544545..12fd7675d67 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,15 @@ +2011-05-07 Eli Zaretskii + + * inttypes.h: Include stdint.h. + (uintmax_t): Don't define, it is defined in stdint.h. + + * sedlibmk.inp (am__append_1): Edit to comment out. + (am__append_2): Edit to expose. + (NEXT_AS_FIRST_DIRECTIVE_STDARG_H, NEXT_STDARG_H, STDARG_H): Edit + to empty. + (@GL_GENERATE_STDARG_H_TRUE@, @GL_GENERATE_STDARG_H_FALSE@): Edit + to comment out corresponding lines. + 2011-04-30 Eli Zaretskii * inttypes.h: New file. diff --git a/msdos/inttypes.h b/msdos/inttypes.h index 650fea1d0a8..e21f1b1055c 100644 --- a/msdos/inttypes.h +++ b/msdos/inttypes.h @@ -20,11 +20,15 @@ along with GNU Emacs. If not, see . */ #ifndef _REPL_INTTYPES_H #define _REPL_INTTYPES_H +/* As of May 2011, DJGPP v2.04 does not include stdint.h in its + inttypes.h, although it should. Therefore, include stdint.h + unconditionally. */ +#include + #if __DJGPP__ > 2 || __DJGPP_MINOR__ >= 4 #include_next #else /* __DJGPP__ < 2.04 */ #include -#define uintmax_t unsigned long long #define strtoumax strtoull #endif /* __DJGPP__ < 2.04 */ diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index a99d0229df8..0c501421821 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -401,6 +401,7 @@ am__cd = cd # MKDIR_P lines are edited further below /^MKDIR_P *=/s/@MKDIR_P@// /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_STDARG_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@// @@ -409,6 +410,7 @@ am__cd = cd /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@// /^NEXT_GETOPT_H *=/s/@[^@\n]*@// +/^NEXT_STDARG_H *=/s/@[^@\n]*@// /^NEXT_STDDEF_H *=/s/@[^@\n]*@// /^NEXT_STDIO_H *=/s/@[^@\n]*@// /^NEXT_STDINT_H *=/s/@[^@\n]*@// @@ -506,6 +508,7 @@ am__cd = cd /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@// /^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/ /^STDBOOL_H *=/s/@[^@\n]*@// +/^STDARG_H *=/s/@[^@\n]*@// /^STDDEF_H *=/s/@[^@\n]*@// /^STDINT_H *=/s/@[^@\n]*@/stdint.h/ /^SYS_TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ @@ -514,6 +517,8 @@ am__cd = cd /^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/ /^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/ /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// +/am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/ +/am__append_2 *=.*verify\.h/s/@[^@\n]*@// /^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o/ /^BUILT_SOURCES *=/s/ *inttypes\.h// /^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)// @@ -554,8 +559,10 @@ s/@echo /@djecho/ # Fix the recipes for header files s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/ s/^@GL_GENERATE_STDBOOL_H_FALSE@// +s/^@GL_GENERATE_STDARG_H_TRUE@/\#/ +s/^@GL_GENERATE_STDARG_H_FALSE@/\#/ s/^@GL_GENERATE_STDDEF_H_TRUE@/\#/ -s/^@GL_GENERATE_STDDEF_H_FALSE@// +s/^@GL_GENERATE_STDDEF_H_FALSE@/\#/ s/^@GL_GENERATE_STDINT_H_TRUE@// s/^@GL_GENERATE_STDINT_H_FALSE@/\#/ /^arg-nonnull\.h:/,/^[ ][ ]*mv /c\ -- 2.39.5