From 9b6ccb1476938785e95474968429359f05d7aaba Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 28 Feb 2010 22:43:41 +0000
Subject: [PATCH] fix name collision with Linux+mred+futures

svn: r18399
---
 src/mzscheme/gc2/newgc.c         | 6 +++---
 src/mzscheme/include/schthread.h | 4 ++--
 src/mzscheme/src/future.c        | 4 ++--
 src/mzscheme/src/mzrt.h          | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c
index b49970c374..7c1a2e9c2d 100644
--- a/src/mzscheme/gc2/newgc.c
+++ b/src/mzscheme/gc2/newgc.c
@@ -136,8 +136,8 @@ static void marking_rmp_debug(NewGC *gc, void *info);
 
 THREAD_LOCAL_DECL(static NewGC *GC);
 #define GCTYPE NewGC
-#define GC_get_GC() (GC)
-#define GC_set_GC(gc) (GC = gc)
+#define GC_get_GC() (GC_instance)
+#define GC_set_GC(gc) (GC_instance = gc)
 
 
 #include "msgprint.c"
@@ -3186,7 +3186,7 @@ static void repair_heap(NewGC *gc)
 static inline void gen1_free_mpage(PageMap pagemap, mpage *page) {
   pagemap_remove(pagemap, page);
   free_backtrace(page);
-  free_pages(GC, page->addr, real_page_size(page));
+  free_pages(GC_instance, page->addr, real_page_size(page));
   free_mpage(page);
 }
 
diff --git a/src/mzscheme/include/schthread.h b/src/mzscheme/include/schthread.h
index ed4de17e31..89f60edfa8 100644
--- a/src/mzscheme/include/schthread.h
+++ b/src/mzscheme/include/schthread.h
@@ -105,7 +105,7 @@ typedef long objhead;
 
 typedef struct Thread_Local_Variables {
   void **GC_variable_stack_;
-  struct NewGC *GC_;
+  struct NewGC *GC_instance_;
   unsigned long GC_gen0_alloc_page_ptr_;
   unsigned long GC_gen0_alloc_page_end_;
   void *bignum_cache_[BIGNUM_CACHE_SIZE];
@@ -387,7 +387,7 @@ XFORM_GC_VARIABLE_STACK_THROUGH_THREAD_LOCAL;
 #endif
 
 #define GC_objhead_template XOA (scheme_get_thread_local_variables()->GC_objhead_template_)
-#define GC XOA (scheme_get_thread_local_variables()->GC_)
+#define GC_instance XOA (scheme_get_thread_local_variables()->GC_instance_)
 #define GC_gen0_alloc_page_ptr XOA (scheme_get_thread_local_variables()->GC_gen0_alloc_page_ptr_)
 #define GC_gen0_alloc_page_end XOA (scheme_get_thread_local_variables()->GC_gen0_alloc_page_end_)
 #define GC_variable_stack XOA (scheme_get_thread_local_variables()->GC_variable_stack_)
diff --git a/src/mzscheme/src/future.c b/src/mzscheme/src/future.c
index 48ec143797..e0e3bb99b2 100644
--- a/src/mzscheme/src/future.c
+++ b/src/mzscheme/src/future.c
@@ -385,7 +385,7 @@ static void init_future_thread(Scheme_Future_State *fs, int i)
   memset(fts, 0, sizeof(Scheme_Future_Thread_State));
   fts->id = i;
 
-  params.shared_GC = GC;
+  params.shared_GC = GC_instance;
   params.fts = fts;
   params.fs = fs;
 
@@ -776,7 +776,7 @@ void *worker_thread_future_loop(void *arg)
   scheme_future_state = fs;
   scheme_future_thread_state = fts;
 
-  GC = params->shared_GC;
+  GC_instance = params->shared_GC;
   scheme_current_thread = params->thread_skeleton;
 
   //Set processor affinity
diff --git a/src/mzscheme/src/mzrt.h b/src/mzscheme/src/mzrt.h
index 0b15c8cd43..06b6e311b3 100644
--- a/src/mzscheme/src/mzrt.h
+++ b/src/mzscheme/src/mzrt.h
@@ -184,7 +184,7 @@ static MZ_INLINE void mzrt_ensure_max_cas(unsigned long *atomic_val, unsigned lo
   while(!set) {
     unsigned long old_val = *atomic_val;
     if (len > old_val) {
-      set = !mzrt_cas(atomic_val, old_val, len);
+      set = !mzrt_cas((size_t *)atomic_val, old_val, len);
     }
     else {
       set = 1;