summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-25 06:15:25 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-25 06:15:25 (GMT)
commitb59563958b65a0c21f340432821301783fc94475 (patch)
treeee9e5cdb92dd5f364648e4c936e4ca5652ecaaf3
parent145f9e6fc5bc10e2c2fa1f6421f7066bb30dad91 (diff)
merge revision(s) 21677:
* node.h (rb_thread_raised_clear): should not clear flags other than raised flags. a patch by Tomoyuki Chikanaga <chikanag AT nippon-control-system.co.jp> at [ruby-dev:37794]. [ruby-dev:37776] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--node.h2
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 928f771..d7315f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 25 15:14:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * node.h (rb_thread_raised_clear): should not clear flags other than
+ raised flags. a patch by Tomoyuki Chikanaga <chikanag AT
+ nippon-control-system.co.jp> at [ruby-dev:37794]. [ruby-dev:37776]
+
Wed Feb 25 15:04:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/extconf.rb (gai_strerror): checks if available and if
diff --git a/node.h b/node.h
index d49567a..476a826 100644
--- a/node.h
+++ b/node.h
@@ -479,7 +479,7 @@ int rb_thread_reset_raised(rb_thread_t th);
#define rb_thread_raised_set(th, f) ((th)->flags |= (f))
#define rb_thread_raised_reset(th, f) ((th)->flags &= ~(f))
#define rb_thread_raised_p(th, f) (((th)->flags & (f)) != 0)
-#define rb_thread_raised_clear(th) ((th)->flags = 0)
+#define rb_thread_raised_clear(th) (rb_thread_raised_reset(th, RAISED_MASK))
#if defined(__cplusplus)
} /* extern "C" { */
diff --git a/version.h b/version.h
index 019b314..bcb871d 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-25"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090225
-#define RUBY_PATCHLEVEL 354
+#define RUBY_PATCHLEVEL 355
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8