merges r25180 from trunk into ruby_1_9_1.

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

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

1 files changed, 2 insertions, 1 deletions

diff --git a/thread.c b/thread.c
index 7ad68c2892..889d664421 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) {