summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-07 16:17:27 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-07 16:17:27 +0000
commit436d5dc6eb2661f55191286437714676694214ed (patch)
tree72e14332828752e02067ec5c563bff305f3093ec
parentfe8e2dd1e11c2e57b5305fcb63528b6d85f74e84 (diff)
* gc.c (rb_objspace): an initializer must be a constant.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 447ba2e98f..030bb55372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 8 01:16:49 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * gc.c (rb_objspace): an initializer must be a constant.
+
Tue Mar 8 01:11:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
* process.c (maxgroups): cast because sysconf(3)'s return value is long.
diff --git a/gc.c b/gc.c
index 0675048126..e703471bf9 100644
--- a/gc.c
+++ b/gc.c
@@ -401,7 +401,7 @@ typedef struct rb_objspace {
static int ruby_initial_gc_stress = 0;
int *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
#else
-static rb_objspace_t rb_objspace = {{initial_malloc_limit}, {initial_heap_min_slots}};
+static rb_objspace_t rb_objspace = {{GC_MALLOC_LIMIT}, {HEAP_MIN_SLOTS}};
int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
#endif
#define malloc_limit objspace->malloc_params.limit