summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--insns.def2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eb779117b2..28ff4df0c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/insns.def b/insns.def
index 3d518d0489..479d0daefe 100644
--- a/insns.def
+++ b/insns.def
@@ -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);
}
/**********************************************************/
diff --git a/version.h b/version.h
index cca195c704..418041aef4 100644
--- a/version.h
+++ b/version.h
@@ -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