From 5aa7ff2b8a41ad688465b3d919aab62d214c74c3 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 1 Nov 2012 10:47:27 +0000 Subject: [PATCH] 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_pthread.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10695875fe..636f4ebfe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 1 19:47:23 2012 Nobuyoshi Nakada + + * 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 * NEWS: add note for Module#refine, Module#refinements, diff --git a/thread_pthread.c b/thread_pthread.c index 01ad0ce4b5..68ca08f18f 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -596,17 +596,17 @@ enum { RUBY_STACK_MIN_LIMIT = 512 * 1024, /* 512KB */ #endif RUBY_STACK_SPACE_LIMIT = 1024 * 1024, -#ifdef PTHREAD_STACK_MIN - 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), -#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) + RUBY_STACK_SPACE_RATIO = 5 }; +#ifdef PTHREAD_STACK_MIN +#define RUBY_STACK_MIN ((RUBY_STACK_MIN_LIMIT < PTHREAD_STACK_MIN) ? \ + PTHREAD_STACK_MIN * 2 : RUBY_STACK_MIN_LIMIT) +#else +#define RUBY_STACK_MIN (RUBY_STACK_MIN_LIMIT) +#endif +#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;