* atomic.h (ATOMIC_OR): _InterlockedOr is not available on migw.

* gc.c (rb_gc_set_params): VM_OBJSPACE is disabled on mignw.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 0 deletions

diff --git a/gc.c b/gc.c
index 2bcd27213f..2b442d998b 100644
--- a/gc.c
+++ b/gc.c
@@ -83,7 +83,9 @@ void *alloca ();
 #define FREE_MIN  4096
 
 static unsigned int initial_malloc_limit   = GC_MALLOC_LIMIT;
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
 static unsigned int initial_heap_min_slots = HEAP_MIN_SLOTS;
+#endif
 static unsigned int initial_free_min       = FREE_MIN;
 
 #define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
@@ -474,6 +476,11 @@ rb_objspace_free(rb_objspace_t *objspace)
     }
     free(objspace);
 }
+#else
+void
+rb_gc_set_params(void)
+{
+}
 #endif
 
 /* tiny heap size */
@@ -1091,6 +1098,7 @@ init_heap(rb_objspace_t *objspace)
     finalizer_table = st_init_numtable();
 }
 
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
 static void
 initial_expand_heap(rb_objspace_t *objspace)
 {
@@ -1101,6 +1109,7 @@ initial_expand_heap(rb_objspace_t *objspace)
         add_heap_slots(objspace, add);
     }
 }
+#endif
 
 static void
 set_heaps_increment(rb_objspace_t *objspace)