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.

3 files changed, 10 insertions, 9 deletions

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