* 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.

2 files changed, 6 insertions, 2 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)