diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-01 10:47:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-01 10:47:27 +0000 |
| commit | 5aa7ff2b8a41ad688465b3d919aab62d214c74c3 (patch) | |
| tree | 075ca5c057cfd31362c0f670bc33fdf460fc7592 /thread_pthread.c | |
| parent | ba1bd089c8445e83f99cb07563234dd8bdbf0f55 (diff) | |
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
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, + 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; |