2 files changed, 4 insertions, 7 deletions

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