nagachika	2014-06-11 23:21:53 +0900 (Wed, 11 Jun 2014)

  New Revision: 46407

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46407

  Log:
    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

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/gc.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46406)
+++ ruby_2_1/ChangeLog	(revision 46407)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Jun 11 22:58:30 2014  Eric Wong  <e@8...>
+
+	* gc.c (ruby_gc_set_params): simplify condition
+
+Wed Jun 11 22:58:30 2014  Eric Wong  <e@8...>
+
+	* gc.c (ruby_gc_set_params): fix building without RGenGC
+
 Wed Jun 11 02:43:32 2014  Kazuki Tsujimoto  <kazuki@c...>
 
 	* test/objspace/test_objspace.rb (TestObjSpace#test_dump_uninitialized_file):
Index: ruby_2_1/gc.c
===================================================================
--- ruby_2_1/gc.c	(revision 46406)
+++ ruby_2_1/gc.c	(revision 46407)
@@ -5749,7 +5749,7 @@ ruby_gc_set_params(int safe_level) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/gc.c#L5749
     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;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46406)
+++ ruby_2_1/version.h	(revision 46407)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-11"
-#define RUBY_PATCHLEVEL 128
+#define RUBY_PATCHLEVEL 129
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45224,45228


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/