Skip to content
Browse files

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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@22624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 75376a7 commit 9b93e18b9200a6095f8bd7c98d8b428191a5dd35 @shyouhei shyouhei committed Feb 25, 2009
Showing with 8 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 node.h
  3. +1 −1 version.h
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 25 15:15:52 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:05:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/extconf.rb (gai_strerror): checks if available and if
View
2 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" { */
View
2 version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-25"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090225
-#define RUBY_PATCHLEVEL 143
+#define RUBY_PATCHLEVEL 144
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8

0 comments on commit 9b93e18

Please sign in to comment.
Something went wrong with that request. Please try again.