[Emacs-diffs] /srv/bzr/emacs/trunk r109418: * nt/config.nt: Sync with autogen/config.in.

[Juanma Barranquero]

------------------------------------------------------------
revno: 109418
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-03 14:16:40 +0200
message:
  * 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.
modified:
  lib-src/ChangeLog
  lib-src/makefile.w32-in
  nt/ChangeLog
  nt/config.nt
  nt/inc/ms-w32.h

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-08-03 10:23:30 +0000
+++ b/lib-src/ChangeLog 2012-08-03 12:16:40 +0000
@@ -1,3 +1,8 @@
+2012-08-03  Juanma Barranquero  <address@hidden>
+
+       * makefile.w32-in (LOCAL_FLAGS): Remove WINDOWSNT and DOS_NT,
+       they are always defined in config.h.
+
 2012-08-03  Eli Zaretskii  <address@hidden>
 
        * ntlib.c (lstat): New function, calls 'stat'.

=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in   2012-08-02 06:19:48 +0000
+++ b/lib-src/makefile.w32-in   2012-08-03 12:16:40 +0000
@@ -23,8 +23,7 @@
 
 .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)

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-08-03 10:23:30 +0000
+++ b/nt/ChangeLog      2012-08-03 12:16:40 +0000
@@ -1,3 +1,11 @@
+2012-08-03  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * inc/sys/stat.h (S_IFLNK): Define.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-08-02 07:31:34 +0000
+++ b/nt/config.nt      2012-08-03 12:16:40 +0000
@@ -133,6 +133,9 @@
    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 @@
 /* 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 @@
 # endif
 #endif
 
-/* Some platforms redefine this. */
-#undef WRETCODE
-
 /* Define this to check for malloc buffer overrun. */
 #undef XMALLOC_OVERRUN_CHECK
 
@@ -1671,9 +1674,6 @@
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
-/* Some platforms redefine this. */
-#undef wait3
-
 #include <conf_post.h>
 
 #endif /* EMACS_CONFIG_H */

=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h   2012-08-02 06:19:48 +0000
+++ b/nt/inc/ms-w32.h   2012-08-03 12:16:40 +0000
@@ -23,9 +23,6 @@
 #ifndef WINDOWSNT
 #define WINDOWSNT
 #endif
-#ifndef DOS_NT
-#define DOS_NT         /* MSDOS or WINDOWSNT */
-#endif
 
 /* #undef const */