summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-02 06:34:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-02 06:34:18 +0000
commit1dae83ef328e649d9c38e72447011021c6ca3898 (patch)
tree8cf355431a6d88269ecac247b3b7b5c1d27351c8
parente98c58ee2700b46f2f32f81bbd7c8bf8f27370ac (diff)
downloadruby-1dae83ef328e649d9c38e72447011021c6ca3898.tar.gz
ruby-1dae83ef328e649d9c38e72447011021c6ca3898.tar.xz
ruby-1dae83ef328e649d9c38e72447011021c6ca3898.zip
* thread.c (ruby_suppress_tracing): get rid of clobbering by
longjmp. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3486fdb2f..283c93dec 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 2 09:20:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* eval.c (rb_origenviron): remove unused old variable.
diff --git a/thread.c b/thread.c
index adaaa8ebe..da4cf9cf3 100644
--- a/thread.c
+++ b/thread.c
@@ -4011,7 +4011,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) {