yugui	2009-03-04 18:19:38 +0900 (Wed, 04 Mar 2009)

  New Revision: 22748

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22748

  Log:
    merges r22659 from trunk into ruby_1_9_1.
    --
    * gc.c (ruby_get_stack_grow_direction): no needs to use thread
      here, and not initialized yet.  [ruby-core:22439]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/gc.c
    branches/ruby_1_9_1/thread_pthread.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22747)
+++ ruby_1_9_1/ChangeLog	(revision 22748)
@@ -1,3 +1,8 @@
+Fri Feb 27 18:01:20 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (ruby_get_stack_grow_direction): no needs to use thread
+	  here, and not initialized yet.  [ruby-core:22439]
+
 Fri Feb 27 17:45:25 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_load_ok): checks if regular file, except for the
Index: ruby_1_9_1/thread_pthread.c
===================================================================
--- ruby_1_9_1/thread_pthread.c	(revision 22747)
+++ ruby_1_9_1/thread_pthread.c	(revision 22748)
@@ -275,7 +275,7 @@
     native_main_thread.stack_start = STACK_END_ADDRESS;
 #else
     if (!native_main_thread.stack_start ||
-        STACK_UPPER(&addr,
+        STACK_UPPER((VALUE *)(void *)&addr,
                     native_main_thread.stack_start > addr,
                     native_main_thread.stack_start < addr)) {
         native_main_thread.stack_start = addr;
Index: ruby_1_9_1/gc.c
===================================================================
--- ruby_1_9_1/gc.c	(revision 22747)
+++ ruby_1_9_1/gc.c	(revision 22748)
@@ -1102,10 +1102,10 @@
 int
 ruby_get_stack_grow_direction(VALUE *addr)
 {
-    rb_thread_t *th = GET_THREAD();
-    SET_STACK_END;
+    VALUE *end;
+    SET_MACHINE_STACK_END(&end);
 
-    if (STACK_END > addr) return ruby_stack_grow_direction = 1;
+    if (end > addr) return ruby_stack_grow_direction = 1;
     return ruby_stack_grow_direction = -1;
 }
 #endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/