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

(GC_MARK_SECONDARY_STACK, GC_MARK_STACK, GC_SETJMP_WORKS)
(SETUP_SLAVE_PTY): New macros.

* src/s/ms-w32.h (GC_SETJMP_WORKS, GC_MARK_STACK): Set in nt/config.nt.

4 files changed, 26 insertions, 16 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4d1ecbb30e9..16a6577cb6c 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (GC_MARK_SECONDARY_STACK, GC_MARK_STACK, GC_SETJMP_WORKS)
+        (SETUP_SLAVE_PTY): New macros.
+
 2012-07-13  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/config.nt b/nt/config.nt
index bf1feff316a..d727cd3fafd 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -160,6 +160,19 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define this to check for short string overrun. */
 #undef GC_CHECK_STRING_OVERRUN
 
+/* Mark a secondary stack, like the register stack on the ia64. */
+#undef GC_MARK_SECONDARY_STACK
+
+/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not
+   known to work. */
+#define GC_MARK_STACK 1
+
+/* Define if setjmp is known to save all registers relevant for conservative
+   garbage collection in the jmp_buf.
+   MSVC ignores the "register" keyword, so test fails even though
+   setjmp does work.  */
+#define GC_SETJMP_WORKS 1
+
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
 #undef GETPGRP_VOID
 
@@ -1238,6 +1251,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if process.c:child_setup should not call setpgrp. */
 #undef SETPGRP_RELEASES_CTTY
 
+/* How to set up a slave PTY, if needed. */
+#undef SETUP_SLAVE_PTY
+
 /* Make process_send_signal work by "typing" a signal character on the pty. */
 #undef SIGNALS_VIA_CHARACTERS
 
@@ -1668,15 +1684,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef noinline
 #endif
 
-/* These won't be used automatically yet.  We also need to know, at least,
-   that the stack is continuous.  */
-#ifdef __GNUC__
-#  ifndef GC_SETJMP_WORKS
-  /* GC_SETJMP_WORKS is nearly always appropriate for GCC.  */
-#    define GC_SETJMP_WORKS 1
-#  endif
-#endif
-
 #endif /* EMACS_CONFIG_H */
 
 /*
diff --git a/src/ChangeLog b/src/ChangeLog
index 5f363b2bffb..bdaa69f0556 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * s/ms-w32.h (GC_SETJMP_WORKS, GC_MARK_STACK): Set in nt/config.nt.
+
 2012-07-14  Glenn Morris  <rgm@gnu.org>
 
         * s/aix4-2.h, s/freebsd.h, s/gnu-linux.h, s/hpux10-20.h:
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index cf8ba6f220c..7128d8a069d 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -50,13 +50,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    for received packets, so datagrams are broken too.  */
 #define BROKEN_DATAGRAM_SOCKETS 1
 
-/* MSVC ignores the "register" keyword, so test fails even though
-   setjmp does work.  */
-#define GC_SETJMP_WORKS 1
-
-/* Enable conservative stack marking for GC.  */
-#define GC_MARK_STACK 1
-
 #define MAIL_USE_SYSTEM_LOCK 1
 
 /* If the character used to separate elements of the executable path