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.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 5e793544545044e05ce588fb8ab6a9c1f5abbb46..12fd7675d67beaf9b2f4e7e0ad1a7e93bca711d6 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <eliz@gnu.org>
 
        * inttypes.h: New file.

diff --git a/msdos/inttypes.h b/msdos/inttypes.h
index 650fea1d0a8ce342cbd5a59dbe4368b5efbfdcdf..e21f1b1055c8f3696cf095a6290670943b5e8b7b 100644 (file)
--- a/msdos/inttypes.h
+++ b/msdos/inttypes.h
@@ -20,11 +20,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 <stdint.h>
+
 #if __DJGPP__ > 2 || __DJGPP_MINOR__ >= 4
 #include_next <inttypes.h>
 #else  /* __DJGPP__ < 2.04 */
 #include <stdlib.h>
-#define uintmax_t unsigned long long
 #define strtoumax strtoull
 #endif /* __DJGPP__ < 2.04 */
 

diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index a99d0229df8f06bc746756d3c6a19043bfdbbcdc..0c501421821d1d02ec818002c50c9c8c90590fde 100644 (file)
--- 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]*@/<getopt.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_STDARG_H *=/s/@[^@\n]*@//
 /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@//
 /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
@@ -409,6 +410,7 @@ am__cd = cd
 /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@/<time.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/
 /^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
+/^NEXT_STDARG_H *=/s/@[^@\n]*@//
 /^NEXT_STDDEF_H *=/s/@[^@\n]*@//
 /^NEXT_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
 /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
@@ -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\