2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 154c844d615..6beadbcfad9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2007-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * s/cygwin.h (GC_MARK_STACK): Enable conservative stack marking.
+
         * frame.c (x_set_frame_parameters): Check number is positive before
         using XFASTINT.
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 3c0d9c410a0..1785c7c6c76 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -140,6 +140,12 @@ Boston, MA 02110-1301, USA.  */
    change their controlling terminal */
 #define vfork fork
 
+/* This should work (at least when compiling with gcc).  But I have no way
+   or intention to verify or even test it.  If you encounter a problem with
+   it, feel free to change this setting, but please add a comment here about
+   why it needed to be changed.  */
+#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b