diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-25 06:15:55 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-25 06:15:55 +0000 |
commit | 732f179503065030a85ec5db47dadc5af5f2d234 (patch) | |
tree | 5a9250033b0a1d158455626e68f45e9722e41e87 | |
parent | c5ffd3b2dff17657cd0c7ab426a972f1fbfbae6c (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_7@22624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | node.h | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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 @@ -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" { */ @@ -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 |