From 6fb0437222f338c8e4c639d8ab961ff1124b5895 Mon Sep 17 00:00:00 2001
From: Kevin Tew <tewk@racket-lang.org>
Date: Wed, 5 Nov 2008 21:09:50 +0000
Subject: [PATCH] Build on Windows fixes

svn: r12302
---
 src/mzscheme/gc2/gc2.h           | 10 ++++++++++
 src/mzscheme/gc2/protect_range.c |  6 +++---
 src/mzscheme/gc2/sighand.c       |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/mzscheme/gc2/gc2.h b/src/mzscheme/gc2/gc2.h
index 3c27e79b35..00e40ed3de 100644
--- a/src/mzscheme/gc2/gc2.h
+++ b/src/mzscheme/gc2/gc2.h
@@ -2,6 +2,16 @@
 #ifndef __mzscheme_gc_2__
 #define __mzscheme_gc_2__
 
+#ifdef MZ_USE_PLACES
+# if _MSC_VER
+#  define THREAD_LOCAL __declspec(thread)
+# else
+#  define THREAD_LOCAL __thread
+# endif
+#else
+# define THREAD_LOCAL /* empty */
+#endif
+
 /***************************************************************************/
 /***   See README for a general overview of the interface architecture.  ***/
 /***************************************************************************/
diff --git a/src/mzscheme/gc2/protect_range.c b/src/mzscheme/gc2/protect_range.c
index 0fc6580027..8d38c3d0ad 100644
--- a/src/mzscheme/gc2/protect_range.c
+++ b/src/mzscheme/gc2/protect_range.c
@@ -10,9 +10,9 @@
 /* VirtualProtect can be used only on pages allocated at the same
    time, so we can't collapse ranges. */
 
-# define initialize_protect_page_ranges(b, s) /* */
-# define add_protect_page_range(s, l, a, w) protect_pages(s, l, w)
-# define flush_protect_page_ranges(w) /* */
+# define initialize_protect_page_ranges(pr, b, s) /* */
+# define add_protect_page_range(pr, s, l, a, w) protect_pages(s, l, w)
+# define flush_protect_page_ranges(pr, w) /* */
 
 #else
 
diff --git a/src/mzscheme/gc2/sighand.c b/src/mzscheme/gc2/sighand.c
index 0d1aa1eeab..68b68cad9b 100644
--- a/src/mzscheme/gc2/sighand.c
+++ b/src/mzscheme/gc2/sighand.c
@@ -128,7 +128,7 @@ static void initialize_signal_handler()
     if (aveh)
       aveh(TRUE, fault_handler);
     else
-      generations_available = 0;
+      GC->generations_available = 0;
   }
 # endif
 }
@@ -148,7 +148,7 @@ static void remove_signal_handler()
   }
 # endif
 # ifdef NEED_SIGWIN
-  if (generations_available) {
+  if (GC->generations_available) {
     HMODULE hm;
     ULONG (WINAPI*rveh)(gcPVECTORED_EXCEPTION_HANDLER);