diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-11 14:21:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-11 14:21:53 +0000 |
| commit | b92e03c5fd766d6e809486fe31615cdd47e61670 (patch) | |
| tree | a2202fe725b9bfc5d302984243317900bf41f914 /gc.c | |
| parent | ad5214df98f0f2dc0918c838441f6ace13f05449 (diff) | |
merge revision(s) r45224,r45228: [Backport #9838]
* gc.c (ruby_gc_set_params): fix building without RGenGC
* gc.c (ruby_gc_set_params): simplify condition
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5749,7 +5749,7 @@ ruby_gc_set_params(int safe_level) get_envparam_int("RUBY_GC_MALLOC_LIMIT_MAX", &gc_params.malloc_limit_max, 0); get_envparam_double("RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR", &gc_params.malloc_limit_growth_factor, 1.0); -#ifdef RGENGC_ESTIMATE_OLDMALLOC +#if RGENGC_ESTIMATE_OLDMALLOC if (get_envparam_int("RUBY_GC_OLDMALLOC_LIMIT", &gc_params.oldmalloc_limit_min, 0)) { rb_objspace_t *objspace = &rb_objspace; objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min; |