From 4d7f10097651c0da3d30b8c3abcd9ced9498b51a Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 10:52:24 +0000 Subject: merge revision(s) 15548: * gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed. [ruby-dev:33857] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 4 +--- version.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dac019890..c02805bde3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 15 19:52:20 2008 Tanaka Akira + + * gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed. [ruby-dev:33857] + Sun Jun 15 19:50:20 2008 Nobuyoshi Nakada * ext/readline/readline.c (readline_event): prevent polling. based on diff --git a/gc.c b/gc.c index bc3ef5a893..f1f065bfcb 100644 --- a/gc.c +++ b/gc.c @@ -453,9 +453,7 @@ stack_end_address(VALUE **stack_end_p) # endif # define STACK_END (stack_end) #endif -#if defined(sparc) || defined(__sparc__) -# define STACK_LENGTH (rb_gc_stack_start - STACK_END + 0x80) -#elif STACK_GROW_DIRECTION < 0 +#if STACK_GROW_DIRECTION < 0 # define STACK_LENGTH (rb_gc_stack_start - STACK_END) #elif STACK_GROW_DIRECTION > 0 # define STACK_LENGTH (STACK_END - rb_gc_stack_start + 1) diff --git a/version.h b/version.h index 3e14697ab8..480ca6c879 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 182 +#define RUBY_PATCHLEVEL 183 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3