naruse	2016-03-29 13:26:59 +0900 (Tue, 29 Mar 2016)

  New Revision: 54348

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

  Log:
    merge revision(s) 53654:
    
    * gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
      [Fix GH-1221]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/gc.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54347)
+++ ruby_2_3/version.h	(revision 54348)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-02-23"
-#define RUBY_PATCHLEVEL 7
+#define RUBY_RELEASE_DATE "2016-03-29"
+#define RUBY_PATCHLEVEL 8
 
 #define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"
 
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54347)
+++ ruby_2_3/ChangeLog	(revision 54348)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Mar 29 13:26:15 2016  Joseph Tibbertsma  <josephtibbertsma@g...>
+
+	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
+	  [Fix GH-1221]
+
 Thu Jan 21 16:39:55 2016  NARUSE, Yui  <naruse@r...>
 
 	* Makefile.in (update-rubyspec): fix r53208 like r53451.
Index: ruby_2_3/gc.c
===================================================================
--- ruby_2_3/gc.c	(revision 54347)
+++ ruby_2_3/gc.c	(revision 54348)
@@ -974,7 +974,7 @@ tick(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/gc.c#L974
 #define RVALUE_UNCOLLECTIBLE_BITMAP(obj)  MARKED_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), (obj))
 #define RVALUE_MARKING_BITMAP(obj)        MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), (obj))
 
-#define RVALUE_PAGE_WB_UNPROTECTED(apge, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj))
+#define RVALUE_PAGE_WB_UNPROTECTED(page, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj))
 #define RVALUE_PAGE_UNCOLLECTIBLE(page, obj)  MARKED_IN_BITMAP((page)->uncollectible_bits, (obj))
 #define RVALUE_PAGE_MARKING(page, obj)        MARKED_IN_BITMAP((page)->marking_bits, (obj))
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53654


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