From e88b960b0a5482c68a01add985b63392f20bcbb3 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 5 Dec 2009 02:36:23 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ thread.c | 3 ++- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dd65f7ddc..721ae0e27b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 2 15:34:15 2009 Nobuyoshi Nakada + + * thread.c (ruby_suppress_tracing): get rid of clobbering by + longjmp. + Fri Oct 16 12:03:31 2009 NARUSE, Yui * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io 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) { diff --git a/version.h b/version.h index 34f5057929..9f8c238e72 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