archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r25180 from trunk into ruby_1_9_1.

Browse source 
--
* 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
This commit is contained in:
yugui 2009-12-05 02:36:23 +00:00
parent fba7863392
commit e88b960b0a
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 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 * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io

3
thread.c
View file

@ -3762,7 +3762,8 @@ VALUE
ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always) ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
int state, raised, tracing; int state, tracing;
volatile int raised;
VALUE result = Qnil; VALUE result = Qnil;
if ((tracing = th->tracing) != 0 && !always) { if ((tracing = th->tracing) != 0 && !always) {

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 356 #define RUBY_PATCHLEVEL 357
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1