nobu	2012-11-01 19:47:27 +0900 (Thu, 01 Nov 2012)

  New Revision: 37402

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

  Log:
    thread_pthread.c: RUBY_STACK_MIN
    
    * thread_pthread.c (RUBY_STACK_MIN): may not a compile time constant.
      fix r37079.  [ruby-dev:46322] [Bug #7247]

  Modified files:
    trunk/ChangeLog
    trunk/thread_pthread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37401)
+++ ChangeLog	(revision 37402)
@@ -1,3 +1,8 @@
+Thu Nov  1 19:47:23 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread_pthread.c (RUBY_STACK_MIN): may not a compile time constant.
+	  fix r37079.  [ruby-dev:46322] [Bug #7247]
+
 Thu Nov  1 16:44:36 2012  Shugo Maeda  <shugo@r...>
 
 	* NEWS: add note for Module#refine, Module#refinements,
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 37401)
+++ thread_pthread.c	(revision 37402)
@@ -596,17 +596,17 @@
     RUBY_STACK_MIN_LIMIT = 512 * 1024, /* 512KB */
 #endif
     RUBY_STACK_SPACE_LIMIT = 1024 * 1024,
+    RUBY_STACK_SPACE_RATIO = 5
+};
 #ifdef PTHREAD_STACK_MIN
-    RUBY_STACK_MIN = ((RUBY_STACK_MIN_LIMIT < PTHREAD_STACK_MIN) ?
-		      PTHREAD_STACK_MIN * 2 : RUBY_STACK_MIN_LIMIT),
+#define RUBY_STACK_MIN ((RUBY_STACK_MIN_LIMIT < PTHREAD_STACK_MIN) ? \
+			PTHREAD_STACK_MIN * 2 : RUBY_STACK_MIN_LIMIT)
 #else
-    RUBY_STACK_MIN = (RUBY_STACK_MIN_LIMIT),
+#define RUBY_STACK_MIN (RUBY_STACK_MIN_LIMIT)
 #endif
-    RUBY_STACK_SPACE_RATIO = 5,
-    RUBY_STACK_MIN_SPACE = RUBY_STACK_MIN/RUBY_STACK_SPACE_RATIO,
-    RUBY_STACK_SPACE = ((RUBY_STACK_MIN_SPACE > RUBY_STACK_SPACE_LIMIT) ?
-			RUBY_STACK_SPACE_LIMIT : RUBY_STACK_MIN_SPACE)
-};
+#define RUBY_STACK_MIN_SPACE RUBY_STACK_MIN/RUBY_STACK_SPACE_RATIO
+#define RUBY_STACK_SPACE ((RUBY_STACK_MIN_SPACE > RUBY_STACK_SPACE_LIMIT) ? \
+			  RUBY_STACK_SPACE_LIMIT : RUBY_STACK_MIN_SPACE)
 
 #ifdef STACK_END_ADDRESS
 extern void *STACK_END_ADDRESS;

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