Permalink
Browse files

gc.c: simplify condition

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent ed6a2d3 commit 44f58afa751e98ec9fe5b89a5a5e71ca474e99cf normal committed Mar 1, 2014
Showing with 6 additions and 2 deletions.
  1. +5 −1 ChangeLog
  2. +1 −1 gc.c
View
6 ChangeLog
@@ -1,11 +1,15 @@
+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
of Function to support readline-6.3. (rl_hook_func_t is available
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
View
2 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;

0 comments on commit 44f58af

Please sign in to comment.