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@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2011-05-20 22:29:10 +00:00
parent 4e5325fe1f
commit c8914f256e
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Sat May 21 02:10:09 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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@ruby-lang.org>
backported r31286 from trunk

2
re.h
View file

@ -27,7 +27,7 @@ struct RMatch {
};
#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));

View file

@ -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