diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-15 16:55:49 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-15 16:55:49 +0000 |
commit | e5989985c7698b606625eddfd5e437ddd6efa77b (patch) | |
tree | d274b3f028a988d1bbcfb970155a27efffc492e8 | |
parent | 9fb5a1cdbf799fd6ab36eb4782b1a1e0dd3783f4 (diff) |
merge revision(s) 39733: [Backport #8527]
* insns.def: fix condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | insns.def | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Jun 16 01:32:26 2013 TAKANO Mitsuhiro <tak@no32.tk> + + * insns.def: fix condition. + Sun Jun 16 01:22:35 2013 Eric Hodel <drbrain@segment7.net> * ext/socket/extconf.rb: Enable RFC 3542 IPV6 socket options for OS X @@ -866,7 +866,7 @@ trace } EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */, - (flag & RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN) ? TOPN(0) : Qundef); + (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef); } /**********************************************************/ @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-16" -#define RUBY_PATCHLEVEL 220 +#define RUBY_PATCHLEVEL 221 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 |