shyouhei	2009-02-25 15:15:25 +0900 (Wed, 25 Feb 2009)

  New Revision: 22622

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22622

  Log:
    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]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/node.h
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22621)
+++ ruby_1_8_6/ChangeLog	(revision 22622)
@@ -1,3 +1,9 @@
+Wed Feb 25 15:14:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* ext/socket/extconf.rb (gai_strerror): checks if available and if
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22621)
+++ ruby_1_8_6/version.h	(revision 22622)
@@ -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
Index: ruby_1_8_6/node.h
===================================================================
--- ruby_1_8_6/node.h	(revision 22621)
+++ ruby_1_8_6/node.h	(revision 22622)
@@ -479,7 +479,7 @@
 #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" { */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/