yugui	2009-12-05 11:36:23 +0900 (Sat, 05 Dec 2009)

  New Revision: 26000

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

  Log:
    merges r25180 from trunk into ruby_1_9_1.
    --
    * thread.c (ruby_suppress_tracing): get rid of clobbering by
      longjmp.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/thread.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25999)
+++ ruby_1_9_1/ChangeLog	(revision 26000)
@@ -1,3 +1,8 @@
+Fri Oct  2 15:34:15 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread.c (ruby_suppress_tracing): get rid of clobbering by
+	  longjmp.
+
 Fri Oct 16 12:03:31 2009  NARUSE, Yui  <naruse@r...>
 
 	* lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io
Index: ruby_1_9_1/thread.c
===================================================================
--- ruby_1_9_1/thread.c	(revision 25999)
+++ ruby_1_9_1/thread.c	(revision 26000)
@@ -3762,7 +3762,8 @@
 ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always)
 {
     rb_thread_t *th = GET_THREAD();
-    int state, raised, tracing;
+    int state, tracing;
+    volatile int raised;
     VALUE result = Qnil;
 
     if ((tracing = th->tracing) != 0 && !always) {
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25999)
+++ ruby_1_9_1/version.h	(revision 26000)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 356
+#define RUBY_PATCHLEVEL 357
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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