Fix Sed scripts and srs/s/msdos.h for gnulib additions. Not tested yet.

 src/s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
 (lstat): Define for DJGPP < 2.04.
 msdos/sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
 (BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
 (GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
 (GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
 (GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
 (HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
 (HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
 (HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
 (HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
 (HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
 (HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
 (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
 (MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
 (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
 (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
 (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
 (WCHAR_T_SUFFIX, WINT_T_SUFFIX): New edits.
 ($(MKDIR_P)): Replace with equivalent DOS command.
 msdos/sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
 (HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
 (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
 edits.

5 files changed, 119 insertions, 0 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index d4979796901..0f2ce0c3e51 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,32 @@
 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
 
+        * sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
+        (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
+        (BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
+        (GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
+        (GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
+        (GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
+        (HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
+        (HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
+        (HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
+        (HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
+        (HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
+        (HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
+        (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
+        (MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
+        (NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
+        (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
+        (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
+        (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
+        (WCHAR_T_SUFFIX, WINT_T_SUFFIX): New edits.
+        ($(MKDIR_P)): Replace with equivalent DOS command.
+
+        * sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
+        (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
+        (HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
+        (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
+        edits.
+
         * depfiles.bat: Create a dummy .Po file only if a file by the same
         name does not already exist in the deps/ subdirectory.
 
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 470c1bf60a6..030b69e583f 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -62,7 +62,18 @@
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
 /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/
+
+/^#undef BITSIZEOF_PTRDIFF_T *$/s/^.*$/#define BITSIZEOF_PTRDIFF_T 32/
+/^#undef BITSIZEOF_SIG_ATOMIC_T *$/s/^.*$/#define BITSIZEOF_SIG_ATOMIC_T 32/
+/^#undef BITSIZEOF_SIZE_T *$/s/^.*$/#define BITSIZEOF_SIZE_T 32/
+/^#undef BITSIZEOF_WCHAR_T *$/s/^.*$/#define BITSIZEOF_WCHAR_T 16/
+/^#undef BITSIZEOF_WINT_T *$/s/^.*$/#define BITSIZEOF_WINT_T 32/
 /^#undef HAVE__BOOL/s/^.*$/#define HAVE__BOOL 1/
+/^#undef HAVE_LONG_LONG_INT *$/s/^.*$/#define HAVE_LONG_LONG_INT 1/
+/^#undef HAVE_SIGNED_SIG_ATOMIC_T *$/s/^.*$/#define HAVE_SIGNED_SIG_ATOMIC_T 1/
+/^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/
+/^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/
+/^#under HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/
 /^#undef inline/s/^.*$/#define inline __inline__/
 /^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/
 /^#undef restrict/s/^.*$/#define restrict __restrict/
@@ -77,6 +88,12 @@ s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"!
 s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
 s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
 s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
+/^#undef HAVE_INTTYPES_H/c\
+#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\
+#define HAVE_INTTYPES_H 1\
+#else\
+#undef HAVE_INTTYPES_H\
+#endif
 /^#undef HAVE_STDINT_H/c\
 #if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\
 #define HAVE_STDINT_H 1\
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index b85b20f1491..c668d73a328 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -47,6 +47,14 @@ am__cd = cd
 /^EXEEXT *=/s/@[^@\n]*@/.exe/
 /^GETOPT_H *=/s/@[^@\n]*@/getopt.h/
 #
+# Gnulib stuff
+/^BITSIZEOF_PTRDIFF_T *=/s/@BITSIZEOF_PTRDIFF_T@/32/
+/^BITSIZEOF_SIG_ATOMIC_T *=/s/@BITSIZEOF_SIG_ATOMIC_T@/32/
+/^BITSIZEOF_SIZE_T *=/s/@BITSIZEOF_SIZE_T@/32/
+/^BITSIZEOF_WCHAR_T *=/s/@BITSIZEOF_WCHAR_T@/16/
+/^BITSIZEOF_WINT_T *=/s/@BITSIZEOF_WINT_T@/32/
+
+#
 # Some GNULIB_* are replaced with zero even though DJGPP does not have
 # these features.  That's because the gnulib replacements cannot
 # possibly work for DJGPP, so we prefer to fail the link than have a
@@ -63,8 +71,11 @@ am__cd = cd
 /^GNULIB_FACCESSAT *=/s/@GNULIB_FACCESSAT@/0/
 /^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/
 /^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/
+/^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/
+/^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/
 /^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/
 /^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/
+/^GNULIB_FUTIMENS *=/s/@GNULIB_FUTIMENS@/0/
 /^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/
 /^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/
 /^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/
@@ -77,12 +88,20 @@ am__cd = cd
 /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/
 /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/
 /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/
+/^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/
 /^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/
 /^GNULIB_LINK *=/s/@GNULIB_LINK@/0/
 /^GNULIB_LINKAT *=/s/@GNULIB_LINKAT@/0/
 /^GNULIB_LSEEK *=/s/@GNULIB_LSEEK@/0/
+/^GNULIB_LSTAT *=/s/@GNULIB_LSTAT@/0/
 /^GNULIB_MALLOC_POSIX *=/s/@GNULIB_MALLOC_POSIX@/0/
+/^GNULIB_MBTOWC *=/s/@GNULIB_MBTOWC@/0/
+/^GNULIB_MKDIRAT *=/s/@GNULIB_MKDIRAT@/0/
 /^GNULIB_MKDTEMP *=/s/@GNULIB_MKDTEMP@/0/
+/^GNULIB_MKFIFO *=/s/@GNULIB_MKFIFO@/0/
+/^GNULIB_MKFIFOAT *=/s/@GNULIB_MKFIFOAT@/0/
+/^GNULIB_MKNOD *=/s/@GNULIB_MKNOD@/0/
+/^GNULIB_MKNODAT *=/s/@GNULIB_MKNODAT@/0/
 /^GNULIB_MKOSTEMP *=/s/@GNULIB_MKOSTEMP@/0/
 /^GNULIB_MKOSTEMPS *=/s/@GNULIB_MKOSTEMPS@/0/
 /^GNULIB_MKSTEMP *=/s/@GNULIB_MKSTEMP@/0/
@@ -104,6 +123,7 @@ am__cd = cd
 /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
 /^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/
 /^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/
+/^GNULIB_STAT *=/s/@GNULIB_STAT@/0/
 /^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/
 /^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/
 /^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/
@@ -121,6 +141,8 @@ am__cd = cd
 /^GNULIB_UNLOCKPT *=/s/@GNULIB_UNLOCKPT@/0/
 /^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/
 /^GNULIB_USLEEP *=/s/@GNULIB_USLEEP@/0/
+/^GNULIB_UTIMENSAT *=/s/@GNULIB_UTIMENSAT@/0/
+/^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/
 /^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/
 /^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/
 /^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/
@@ -142,9 +164,12 @@ am__cd = cd
 /^HAVE_EUIDACCESS *=/s/@HAVE_EUIDACCESS@/0/
 /^HAVE_FACCESSAT *=/s/@HAVE_FACCESSAT@/0/
 /^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/
+/^HAVE_FCHMODAT *=/s/@HAVE_FCHMODAT@/0/
 /^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/
+/^HAVE_FSTATAT *=/s/@HAVE_FSTATAT@/0/
 /^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/
 /^HAVE_FTRUNCATE *=/s/@HAVE_FTRUNCATE@/1/
+/^HAVE_FUTIMENS *=/s/@HAVE_FUTIMENS@/0/
 /^HAVE_GETDTABLESIZE *=/s/@HAVE_GETDTABLESIZE@/0/
 /^HAVE_GETGROUPS *=/s/@HAVE_GETGROUPS@/0/
 /^HAVE_GETHOSTNAME *=/s/@HAVE_GETHOSTNAME@/1/
@@ -154,10 +179,19 @@ am__cd = cd
 /^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/
 /^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/
 /^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/
+/^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/
+/^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/
 /^HAVE_LINK *=/s/@HAVE_LINK@/1/
 /^HAVE_LINKAT *=/s/@HAVE_LINKAT@/0/
+/^HAVE_LONG_LONG_INT *=/s/@HAVE_LONG_LONG_INT@/1/
+/^HAVE_LSTAT *=/s/@HAVE_LSTAT@/HAVE_LSTAT/
 /^HAVE_MAKEINFO *=/s/@HAVE_MAKEINFO@/yes/
+/^HAVE_MKDIRAT *=/s/@HAVE_MKDIRAT@/0/
 /^HAVE_MKDTEMP *=/s/@HAVE_MKDTEMP@/0/
+/^HAVE_MKFIFO *=/s/@HAVE_MKFIFO@/1/
+/^HAVE_MKFIFOAT *=/s/@HAVE_MKFIFOAT@/0/
+/^HAVE_MKNOD *=/s/@HAVE_MKNOD@/1/
+/^HAVE_MKNODAT *=/s/@HAVE_MKNODAT@/0/
 /^HAVE_MKOSTEMP *=/s/@HAVE_MKOSTEMP@/0/
 /^HAVE_MKOSTEMPS *=/s/@HAVE_MKOSTEMPS@/0/
 /^HAVE_MKSTEMP *=/s/@HAVE_MKSTEMP@/1/
@@ -176,7 +210,11 @@ am__cd = cd
 /^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/
 /^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
 /^HAVE_SETENV *=/s/@HAVE_SETENV@/1/
+/^HAVE_SIGNED_SIG_ATOMIC_T *=/s/@HAVE_SIGNED_SIG_ATOMIC_T@/1/
+/^HAVE_SIGNED_WCHAR_T *=/s/@HAVE_SIGNED_WCHAR_T@/0/
+/^HAVE_SIGNED_WINT_T *=/s/@HAVE_SIGNED_WINT_T@/1/
 /^HAVE_SLEEP *=/s/@HAVE_SLEEP@/1/
+/^HAVE_STDINT_H *=/s/@HAVE_STDINT_H@/HAVE_STDINT_H/
 /^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/
 /^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/
 /^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/
@@ -184,13 +222,19 @@ am__cd = cd
 /^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/
 /^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/
 /^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/
+/^HAVE_SYS_BITYPES_H *=/s/@HAVE_SYS_BITYPES_H@/0/
+/^HAVE_SYS_INTTYPES_H *=/s/@HAVE_SYS_INTTYPES_H@/0/
 /^HAVE_SYS_LOADAVG_H *=/s/@HAVE_SYS_LOADAVG_H@/0/
 /^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/
+/^HAVE_SYS_TYPES_H *=/s/@HAVE_SYS_TYPES_H@/1/
 /^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/
 /^HAVE_UNISTD_H *=/s/@HAVE_UNISTD_H@/1/
 /^HAVE_UNLINKAT *=/s/@HAVE_UNLINKAT@/0/
 /^HAVE_UNLOCKPT *=/s/@HAVE_UNLOCKPT@/0/
+/^HAVE_UNSIGNED_LONG_LONG_INT *=/s/@HAVE_UNSIGNED_LONG_LONG_INT@/1/
 /^HAVE_USLEEP *=/s/@HAVE_USLEEP@/1/
+/^HAVE_UTIMENSAT *=/s/@HAVE_UTIMENSAT@/0/
+/^HAVE_WCHAR_H *=/s/@HAVE_WCHAR_H@/1/
 /^HAVE_WCHAR_T *=/s/@HAVE_WCHAR_T@/1/
 /^HAVE_XSERVER *=/s/@HAVE_XSERVER@/0/
 /^HAVE__BOOL *=/s/@HAVE__BOOL@/1/
@@ -201,14 +245,20 @@ am__cd = cd
 /^LD_FIRSTFLAG *=/s/@[^@\n]*@//
 /^LIBS *=/s/@[^@\n]*@//
 /^MAKEINFO *=/s/@MAKEINFO@/makeinfo/
+# 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_STDDEF_H *=/s/@[^@\n]*@//
+/^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>!
 /^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_STDDEF_H *=/s/@[^@\n]*@//
+/^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
 /^NEXT_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/
+/^NEXT_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>!
 /^NEXT_TIME_H *=/s/@[^@\n]*@/<time.h>/
 /^NEXT_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/
 /^OBJEXT *=/s/@[^@\n]*@/o/
@@ -233,7 +283,12 @@ am__cd = cd
 /^REPLACE_LINKAT *=/s/@REPLACE_LINKAT@/0/
 /^REPLACE_LOCALTIME_R *=/s/@REPLACE_LOCALTIME_R@/0/
 /^REPLACE_LSEEK *=/s/@REPLACE_LSEEK@/0/
+/^REPLACE_LSTAT *=/s/@REPLACE_LSTAT@/0/
 /^REPLACE_MALLOC *=/s/@REPLACE_MALLOC@/0/
+/^REPLACE_MBTOWC *=/s/@REPLACE_MBTOWC@/0/
+/^REPLACE_MKDIR *=/s/@REPLACE_MKDIR@/0/
+/^REPLACE_MKFIFO *=/s/@REPLACE_MKFIFO@/0/
+/^REPLACE_MKNOD *=/s/@REPLACE_MKNOD@/0/
 /^REPLACE_MKSTEMP *=/s/@REPLACE_MKSTEMP@/0/
 /^REPLACE_MKTIME *=/s/@REPLACE_MKTIME@/0/
 /^REPLACE_NANOSLEEP *=/s/@REPLACE_NANOSLEEP@/0/
@@ -247,6 +302,7 @@ am__cd = cd
 /^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/
 /^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/
 /^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/
+/^REPLACE_STAT *=/s/@REPLACE_STAT@/0/
 /^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/
 /^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/
 /^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/
@@ -255,13 +311,20 @@ am__cd = cd
 /^REPLACE_UNLINKAT *=/s/@REPLACE_UNLINKAT@/0/
 /^REPLACE_UNSETENV *=/s/@REPLACE_UNSETENV@/0/
 /^REPLACE_USLEEP *=/s/@REPLACE_USLEEP@/0/
+/^REPLACE_UTIMENSAT *=/s/@REPLACE_UTIMENSAT@/0/
+/^REPLACE_WCTOMB *=/s/@REPLACE_WCTOMB@/0/
 /^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/
+/^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@//
+/^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/
 /^STDBOOL_H *=/s/@[^@\n]*@//
 /^STDDEF_H *=/s/@[^@\n]*@//
+/^STDINT_H *=/s/@[^@\n]*@/stdint.h/
 /^SYS_TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/
 /^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/
 /^UNISTD_H_HAVE_WINSOCK2_H *=/s/@[^@\n]*@/0/
 /^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@//
 /^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o/
 /^srcdir *=/s/@[^@\n]*@/./
 /^top_srcdir *=/s/@[^@\n]*@/../
@@ -310,3 +373,4 @@ s/\.in-h\;  *\\$/.in-h >> $@-t/
 /^unistd\.h:/,/^        [       ]*mv /{
   s/'\; \\ *$/' >> $@-t/
 }
+s!\$(MKDIR_P)[  ][      ]*sys!command.com /c "if not exist sys\stat.h md sys"!
diff --git a/src/ChangeLog b/src/ChangeLog
index 29a213a1e09..b49b7a2d3f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
+        (lstat): Define for DJGPP < 2.04.
+
 2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         * dired.c (Ffile_attributes): Increase size of modes from 10 to 12
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 8debd28dccb..29ca0629899 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -80,6 +80,12 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    strtold, so use _strtold in all versions.  */
 #define strtold _strtold
 
+#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3
+# define HAVE_LSTAT 1
+#else
+# define lstat stat
+#endif
+
 /* End of gnulib-related stuff.  */
 
 /* When $TERM is "internal" then this is substituted:  */