aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-01 10:08:10 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-01 10:08:10 +0000
commit44f58afa751e98ec9fe5b89a5a5e71ca474e99cf (patch)
tree5bff0cd42084752da4df74151135c06b4d951bfe
parented6a2d3bf695c8781cd27b86c39c1151b57f36f4 (diff)
downloadruby-44f58afa751e98ec9fe5b89a5a5e71ca474e99cf.tar.gz
gc.c: simplify condition
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--gc.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 98861c8b73..e913ff96ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 1 19:06:47 2014 Eric Wong <e@80x24.org>
+
+ * gc.c (ruby_gc_set_params): simplify condition
+
Sat Mar 1 16:18:40 2014 Tanaka Akira <akr@fsij.org>
* ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
@@ -5,7 +9,7 @@ Sat Mar 1 16:18:40 2014 Tanaka Akira <akr@fsij.org>
since readline-4.2.)
Reported by Dmitry Medvinsky. [ruby-core:61141] [Bug #9578]
-Sat Mar 1 16:05:58 2014 Eric Wong <e@80x24.org>
+Sat Mar 1 16:05:58 2014 Eric Wong <e@80x24.org>
* gc.c (ruby_gc_set_params): fix building without RGenGC
diff --git a/gc.c b/gc.c
index a677370e6b..9a6a8c7eef 100644
--- a/gc.c
+++ b/gc.c
@@ -5827,7 +5827,7 @@ ruby_gc_set_params(int safe_level)
get_envparam_size ("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);
-#if (USE_RGENGC) && defined(RGENGC_ESTIMATE_OLDMALLOC)
+#if RGENGC_ESTIMATE_OLDMALLOC
if (get_envparam_size("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;