summaryrefslogtreecommitdiffstats
path: root/thread.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 02:36:23 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 02:36:23 +0000
commitd3ce5dbd64b40b027e1e4ddbca16c8405e82cffb (patch)
tree5f28957913cd42f749071bc19cec57710faad72c /thread.c
parent17d0a403c0fd248586f37707c4409d7923d33e6e (diff)
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
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c3
1 files changed, 2 insertions, 1 deletions
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) {