merges r25180 from trunk into ruby_1_9_1.

--
* thread.c (ruby_suppress_tracing): get rid of clobbering by
  longjmp.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9dd65f7dd..721ae0e27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct  2 15:34:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_suppress_tracing): get rid of clobbering by
+	  longjmp.
+
 Fri Oct 16 12:03:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io
diff --git a/thread.c b/thread.c
index 7ad68c289..889d66442 100644
--- a/thread.c
+++ b/thread.c
@@ -3762,7 +3762,8 @@ VALUE
 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) {
diff --git a/version.h b/version.h
index 34f505792..9f8c238e7 100644
--- a/version.h
+++ b/version.h
@@ -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