summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-21 13:01:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-21 13:01:37 +0000
commitfd807aa2ea743a8bc95f08fa8eb7fd137f21f14a (patch)
treea89a19f3cb6151d6ca896c90c9f808e39b63f6a9
parentb073b5347bc90a6786f1cdea32bcfce69430ea1b (diff)
* gc.c (rb_gc_set_params): set parameters always.
[ruby-dev:44648] [Bug #5467] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gc.c9
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c46c2c4235..bffcd2ce3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 21 22:01:35 2011 Nobuyoshi Nakada <[email protected]>
+
+ * gc.c (rb_gc_set_params): set parameters always.
+ [ruby-dev:44648] [Bug #5467]
+
Fri Oct 21 12:10:20 2011 Naohisa Goto <[email protected]>
* atomic.h: change Solaris checking macro because atomic_ops can work
diff --git a/gc.c b/gc.c
index ccd74412bd..8862484b54 100644
--- a/gc.c
+++ b/gc.c
@@ -414,6 +414,7 @@ rb_objspace_alloc(void)
return objspace;
}
+#endif
static void initial_expand_heap(rb_objspace_t *objspace);
@@ -458,6 +459,7 @@ rb_gc_set_params(void)
}
}
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
static void gc_sweep(rb_objspace_t *);
static void slot_sweep(rb_objspace_t *, struct heaps_slot *);
static void gc_clear_mark_on_sweep_slots(rb_objspace_t *);
@@ -490,11 +492,6 @@ rb_objspace_free(rb_objspace_t *objspace)
}
free(objspace);
}
-#else
-void
-rb_gc_set_params(void)
-{
-}
#endif
/* tiny heap size */
@@ -1116,7 +1113,6 @@ 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)
{
@@ -1126,7 +1122,6 @@ initial_expand_heap(rb_objspace_t *objspace)
add_heap_slots(objspace, min_size - heaps_used);
}
}
-#endif
static void
set_heaps_increment(rb_objspace_t *objspace)