nobu	2010-04-14 16:29:04 +0900 (Wed, 14 Apr 2010)

  New Revision: 27338

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

  Log:
    * gc.c (GET_STACK_BOUNDS): fixed macro argument names.  a patch from
      Satoshi Shiba <shiba AT rvm.jp> at [ruby-dev:40973].
    
    * gc.h (ruby_get_stack_grow_direction): fixed prototype.
    
    * thread_pthread.c (get_stack, ruby_stack_overflowed_p): both side
      should be same type.  [Bug #3145]

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
    trunk/gc.h
    trunk/thread_pthread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27337)
+++ ChangeLog	(revision 27338)
@@ -1,3 +1,13 @@
+Wed Apr 14 16:29:02 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (GET_STACK_BOUNDS): fixed macro argument names.  a patch from
+	  Satoshi Shiba <shiba AT rvm.jp> at [ruby-dev:40973].
+
+	* gc.h (ruby_get_stack_grow_direction): fixed prototype.
+
+	* thread_pthread.c (get_stack, ruby_stack_overflowed_p): both side
+	  should be same type.  [Bug #3145]
+
 Wed Apr 14 15:58:11 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_string_value_cstr): make NUL terminated if it is
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 27337)
+++ thread_pthread.c	(revision 27338)
@@ -221,7 +221,7 @@
 #   endif
     if (pthread_attr_getguardsize(&attr, &guard) == 0) {
 	STACK_GROW_DIR_DETECTION;
-	STACK_DIR_UPPER((void)0, *addr = (char *)*addr + guard);
+	STACK_DIR_UPPER((void)0, (void)(*addr = (char *)*addr + guard));
 	*size -= guard;
     }
 # else
@@ -850,7 +850,7 @@
     }
 #ifdef STACKADDR_AVAILABLE
     else if (get_stack(&base, &size) == 0) {
-	STACK_DIR_UPPER(base = (char *)base + size, (void)0);
+	STACK_DIR_UPPER((void)(base = (char *)base + size), (void)0);
     }
 #endif
     else {
Index: gc.c
===================================================================
--- gc.c	(revision 27337)
+++ gc.c	(revision 27338)
@@ -2099,7 +2099,7 @@
 #elif STACK_GROW_DIRECTION > 0
 #define GET_STACK_BOUNDS(start, end, appendix) (start = STACK_START, end = STACK_END+appendix)
 #else
-#define GET_STACK_BOUNDS(stack_start, stack_end, appendix) \
+#define GET_STACK_BOUNDS(start, end, appendix) \
     ((STACK_END < STACK_START) ? \
      (start = STACK_END, end = STACK_START) : (start = STACK_START, end = STACK_END+appendix))
 #endif
Index: gc.h
===================================================================
--- gc.h	(revision 27337)
+++ gc.h	(revision 27338)
@@ -66,7 +66,7 @@
 # define STACK_UPPER(x, a, b) b
 #else
 RUBY_EXTERN int ruby_stack_grow_direction;
-int ruby_get_stack_grow_direction(VALUE *addr);
+int ruby_get_stack_grow_direction(volatile VALUE *addr);
 # define stack_growup_p(x) (			\
 	(ruby_stack_grow_direction ?		\
 	 ruby_stack_grow_direction :		\

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