Adapt Windows port to recent changes in autogen/config.in.

* lib-src/makefile.w32-in (CONFIG_H): Update dependencies.
(CONF_POST_H): New macro.

* lib/makefile.w32-in (CONFIG_H): Update dependencies.
(CONF_POST_H): New macro.

* nt/config.nt: Sync with autogen/config.in.
Remove code moved to conf_post.h and include <conf_post.h>
(NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME)
(USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros.

* src/makefile.w32-in (CONFIG_H): Update dependencies.
(CONF_POST_H): New macro.

* src/s/ms-w32.h (SEPCHAR, NULL_DEVICE): Remove; moved to nt/config.nt.

9 files changed, 70 insertions, 108 deletions

diff --git a/ChangeLog b/ChangeLog
index 407bec2a03b..6c74a79f5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lib/makefile.w32-in (CONFIG_H): Update dependencies.
+        (CONF_POST_H): New macro.
+
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
         * configure.ac (S_FILE): Remove output variable.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2d2bb06cd6f..c5d6ed6eaf0 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (CONFIG_H): Update dependencies.
+        (CONF_POST_H): New macro.
+
 2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         Update .PHONY listings in makefiles.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 65e2f7cae25..8c9482b9194 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -362,8 +362,10 @@ GNU_LIB		= $(EMACS_ROOT)/lib
 
 MS_W32_H       = $(SRC)/s/ms-w32.h \
                  $(NT_INC)/sys/stat.h
-CONFIG_H       = $(SRC)/config.h \
+CONF_POST_H    = $(SRC)/conf_post.h \
                  $(MS_W32_H)
+CONFIG_H       = $(SRC)/config.h \
+                 $(CONF_POST_H)
 INTTYPES_H     = $(NT_INC)/inttypes.h \
                  $(NT_INC)/stdint.h
 NTLIB_H        = $(LIB_SRC)/ntlib.h \
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 345520798eb..4cebc727513 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -73,8 +73,10 @@ C_CTYPE_H      = $(GNU_LIB)/c-ctype.h \
                  $(NT_INC)/stdbool.h
 MS_W32_H       = $(SRC)/s/ms-w32.h \
                  $(NT_INC)/sys/stat.h
-CONFIG_H       = $(SRC)/config.h \
+CONF_POST_H    = $(SRC)/conf_post.h \
                  $(MS_W32_H)
+CONFIG_H       = $(SRC)/config.h \
+                 $(CONF_POST_H)
 FILEMODE_H     = $(GNU_LIB)/filemode.h \
                  $(NT_INC)/sys/stat.h
 FTOASTR_H      = $(GNU_LIB)/ftoastr.h \
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 000e21a842e..5e6b3146e1d 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        Remove code moved to conf_post.h and include <conf_post.h>
+        (NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME)
+        (USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros.
+
 2012-07-29  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/config.nt b/nt/config.nt
index dfb4f61ac80..37d0009c750 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -36,6 +36,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
+/* Define to use the convention that & in the full name stands for the login
+   id. */
+#undef AMPERSAND_FULL_NAME
+
 /* Define to the number of bits in type 'ptrdiff_t'. */
 #undef BITSIZEOF_PTRDIFF_T
 
@@ -1166,6 +1170,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you are using NS windowing under GNUstep. */
 #undef NS_IMPL_GNUSTEP
 
+/* Name of the file to open to get a null file, or a data sink. */
+#define NULL_DEVICE "NUL:"
+
 /* Define to 1 if the nlist n_name member is a pointer */
 #undef N_NAME_POINTER
 
@@ -1248,6 +1255,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if emacs.c needs to call run_time_remap; for HPUX. */
 #undef RUN_TIME_REMAP
 
+/* Character that separates PATH elements. */
+#define SEPCHAR ';'
+
 /* Define if process.c:child_setup should not call setpgrp. */
 #undef SETPGRP_RELEASES_CTTY
 
@@ -1257,6 +1267,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Make process_send_signal work by "typing" a signal character on the pty. */
 #undef SIGNALS_VIA_CHARACTERS
 
+/* Define if AH_BOTTOM should include signal.h. */
+#undef SIGNAL_H_AHB
+
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'sig_atomic_t'. */
 #undef SIG_ATOMIC_T_SUFFIX
@@ -1306,6 +1319,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
 
+/* Some platforms redefine this. */
+#undef TIOCSIGSEND
+
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
@@ -1326,6 +1342,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if the system has Unix98 PTYs. */
 #undef UNIX98_PTYS
 
+/* How to get a user's full name. */
+#define USER_FULL_NAME pw->pw_gecos
+
 /* Define to 1 if using GTK. */
 #undef USE_GTK
 
@@ -1353,6 +1372,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if the system is compatible with System V. */
 #undef USG5
 
+/* Define if the system is compatible with System V Release 4. */
+#undef USG5_4
+
 /* Define for USG systems where it works to open a pty's tty in the parent
    process, then close and reopen it in the child. */
 #undef USG_SUBTTY_WORKS
@@ -1383,6 +1405,9 @@ 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
 
@@ -1483,6 +1508,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    declarations. Define as empty for no equivalent. */
 #undef __restrict_arr
 
+/* Some platforms redefine this. */
+#undef _longjmp
+
+/* Some platforms redefine this. */
+#undef _setjmp
+
 /* Define to the used os dependent file. */
 #define config_opsysfile "s/ms-w32.h"
 
@@ -1549,6 +1580,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define as a signed type of the same size as size_t. */
 #undef ssize_t
 
+/* Define to enable asynchronous subprocesses. */
+#define subprocesses
+
 /* Define to any substitute for sys_siglist. */
 #undef sys_siglist
 
@@ -1585,104 +1619,10 @@ 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
 
-/* Not valid on Windows.  */
-#if 0
-/* On AIX 3 this must be included before any other include file.  */
-#include <alloca.h>
-#if ! HAVE_ALLOCA
-# error "alloca not available on this machine"
-#endif
-#endif
-
-/* This silences a few compilation warnings on FreeBSD.  */
-#ifdef BSD_SYSTEM_AHB
-#undef BSD_SYSTEM_AHB
-#undef BSD_SYSTEM
-#if __FreeBSD__ == 1
-#define BSD_SYSTEM 199103
-#elif __FreeBSD__ == 2
-#define BSD_SYSTEM 199306
-#elif __FreeBSD__ >= 3
-#define BSD_SYSTEM 199506
-#endif
-#endif
-
-/* Define AMPERSAND_FULL_NAME if you use the convention
-   that & in the full name stands for the login id.  */
-#undef AMPERSAND_FULL_NAME
-
-/* `subprocesses' should be defined if you want to
-   have code for asynchronous subprocesses
-   (as used in M-x compile and M-x shell).
-   Only MSDOS does not support this (it overrides
-   this in its config_opsysfile below).  */
-
-#define subprocesses
-
-/* Include the os dependent file.  */
-#ifdef config_opsysfile
-# include config_opsysfile
-#endif
-
-/* Mac OS X / GNUstep need a bit more pure memory.  Of the existing knobs,
-   SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.  */
-#ifdef HAVE_NS
-#if defined NS_IMPL_GNUSTEP
-#  define SYSTEM_PURESIZE_EXTRA 30000
-#elif defined DARWIN_OS
-#  define SYSTEM_PURESIZE_EXTRA 200000
-#endif
-#endif
-
-#ifdef emacs /* Don't do this for lib-src.  */
-/* Tell regex.c to use a type compatible with Emacs.  */
-#define RE_TRANSLATE_TYPE Lisp_Object
-#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
-#ifdef make_number
-/* If make_number is a macro, use it.  */
-#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
-#else
-/* If make_number is a function, avoid it.  */
-#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0))
-#endif
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#if __GNUC__ >= 3  /* On GCC 3.0 we might get a warning.  */
-#define NO_INLINE __attribute__((noinline))
-#else
-#define NO_INLINE
-#endif
-
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
-#define EXTERNALLY_VISIBLE __attribute__((externally_visible))
-#else
-#define EXTERNALLY_VISIBLE
-#endif
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
-#else
-# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-#endif
-
-#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
-
-/* Some versions of GNU/Linux define noinline in their headers.  */
-#ifdef noinline
-#undef noinline
-#endif
+#include <conf_post.h>
 
 #endif /* EMACS_CONFIG_H */
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 9b8de9ff23e..bf172320eed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (CONFIG_H): Update dependencies.
+        (CONF_POST_H): New macro.
+
+        * s/ms-w32.h (SEPCHAR, NULL_DEVICE): Remove; moved to nt/config.nt.
+
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (S_FILE): No longer set by configure.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 10ab0619fb4..ee5424cf757 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -405,9 +405,10 @@ CODING_H       = $(SRC)/coding.h \
                  $(SRC)/composite.h
 MS_W32_H       = $(SRC)/s/ms-w32.h \
                  $(NT_INC)/sys/stat.h
-CONFIG_H       = $(SRC)/config.h \
-                 $(SRC)/conf_post.h \
+CONF_POST_H    = $(SRC)/conf_post.h \
                  $(MS_W32_H)
+CONFIG_H       = $(SRC)/config.h \
+                 $(CONF_POST_H)
 DIR_H          = $(NT_INC)/sys/dir.h \
                  $(SRC)/ndir.h
 W32GUI_H       = $(SRC)/w32gui.h \
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index bcc4c4235ee..ca4c1001ec9 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -52,10 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define MAIL_USE_SYSTEM_LOCK 1
 
-/* If the character used to separate elements of the executable path
-   is not ':', #define this to be the appropriate character constant.  */
-#define SEPCHAR ';'
-
 /* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */
 #ifdef __GNUC__
 #define HAVE_ATTRIBUTE_ALIGNED 1
@@ -141,9 +137,6 @@ struct sigaction {
 #define SIG_SETMASK     2
 #define SIG_UNBLOCK     3
 
-/* The null device on Windows NT.  */
-#define NULL_DEVICE     "NUL:"
-
 #ifndef MAXPATHLEN
 #define MAXPATHLEN      _MAX_PATH
 #endif