shyouhei	2011-05-21 07:29:10 +0900 (Sat, 21 May 2011)

  New Revision: 31664

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

  Log:
    merge revision(s) 31312:
    
    * re.h (RMATCH_REGS): parenthesize cast expression.  suggested
      from Nikolai Weibull in [ruby-core:35825].
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/re.h
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31663)
+++ ruby_1_8_7/ChangeLog	(revision 31664)
@@ -1,3 +1,8 @@
+Sat May 21 02:10:09 2011  Yukihiro Matsumoto  <matz@r...>
+
+	* re.h (RMATCH_REGS): parenthesize cast expression.  suggested
+	  from Nikolai Weibull in [ruby-core:35825].
+
 Sat May 21 01:32:08 2011  NAKAMURA Usaku  <usa@r...>
 
 	backported r31286 from trunk
Index: ruby_1_8_7/re.h
===================================================================
--- ruby_1_8_7/re.h	(revision 31663)
+++ ruby_1_8_7/re.h	(revision 31664)
@@ -27,7 +27,7 @@
 };
 
 #define RMATCH(obj)  (R_CAST(RMatch)(obj))
-#define RMATCH_REGS(obj)  (R_CAST(RMatch)(obj)->regs)
+#define RMATCH_REGS(obj)  (R_MATCH(obj)->regs)
 
 VALUE rb_reg_regcomp _((VALUE));
 long rb_reg_search _((VALUE, VALUE, long, long));
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 31663)
+++ ruby_1_8_7/version.h	(revision 31664)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2011-05-21"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20110521
-#define RUBY_PATCHLEVEL 341
+#define RUBY_PATCHLEVEL 342
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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