diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 02:36:23 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 02:36:23 +0000 |
commit | e88b960b0a5482c68a01add985b63392f20bcbb3 (patch) | |
tree | 5f28957913cd42f749071bc19cec57710faad72c | |
parent | fba7863392bdf1c968f574de129c14ae30784f88 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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 @@ -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) { @@ -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 |