* nt/config.nt: Sync with autogen/config.in.

(DOS_NT, MSDOS): New macros.
(WRETCODE, wait3): Remove.

* nt/inc/ms-w32.h (DOS_NT): Remove; defined in config.nt.

* lib-src/makefile.w32-in (LOCAL_FLAGS): Remove WINDOWSNT and DOS_NT,
they are always defined in config.h.

5 files changed, 20 insertions, 11 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c98d377f199..28232c1abc4 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (LOCAL_FLAGS): Remove WINDOWSNT and DOS_NT,
+        they are always defined in config.h.
+
 2012-08-03  Eli Zaretskii  <eliz@gnu.org>
 
         * ntlib.c (lstat): New function, calls 'stat'.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 26605b8ba4e..a03d761e7ec 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -23,8 +23,7 @@ ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\
 
 .PHONY: make-docfile
 
-LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
-                  -DNO_ARCHIVES=1 -I../lib \
+LOCAL_FLAGS     = -DNO_LDAV=1 -DNO_ARCHIVES=1 -I../lib \
                   -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS            = $(BASE_LIBS) $(ADVAPI32)
diff --git a/nt/ChangeLog b/nt/ChangeLog
index d8b9b14a3fb..966407e5ed3 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (DOS_NT, MSDOS): New macros.
+        (WRETCODE, wait3): Remove.
+
+        * inc/ms-w32.h (DOS_NT): Remove; defined in config.nt.
+
 2012-08-03  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/sys/stat.h (S_IFLNK): Define.
diff --git a/nt/config.nt b/nt/config.nt
index 1c05fcb6497..abc90687e3f 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -133,6 +133,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    we did ioctl TIOCSCTTY). */
 #undef DONT_REOPEN_PTY
 
+/* Define if the system is MS DOS or MS Windows. */
+#define DOS_NT
+
 /* Define to 1 if you are using the GNU C Library. */
 #undef DOUG_LEA_MALLOC
 
@@ -1161,6 +1164,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to support POP mail retrieval. */
 #define MAIL_USE_POP 1
 
+/* Define if the system is MS DOS. */
+#undef MSDOS
+
 /* Define if system's imake configuration file defines `NeedWidePrototypes' as
    `NO'. */
 #undef NARROWPROTO
@@ -1427,9 +1433,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # endif
 #endif
 
-/* Some platforms redefine this. */
-#undef WRETCODE
-
 /* Define this to check for malloc buffer overrun. */
 #undef XMALLOC_OVERRUN_CHECK
 
@@ -1671,9 +1674,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
-/* Some platforms redefine this. */
-#undef wait3
-
 #include <conf_post.h>
 
 #endif /* EMACS_CONFIG_H */
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 8c02a8b8a66..82590e2c350 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -23,9 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef WINDOWSNT
 #define WINDOWSNT
 #endif
-#ifndef DOS_NT
-#define DOS_NT  /* MSDOS or WINDOWSNT */
-#endif
 
 /* #undef const */