diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gc.h | 1 | ||||
| -rw-r--r-- | thread_pthread.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,6 @@ -Sun Jun 10 17:54:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 10 17:54:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * gc.h (IS_STACK_DIR_UPPER): utility macro. * thread_pthread.c (get_stack): seems stack size does not include guard size on Mac OS X. @@ -81,6 +81,7 @@ int ruby_get_stack_grow_direction(volatile VALUE *addr); #define STACK_GROW_DIR_DETECTION VALUE stack_grow_dir_detection #define STACK_DIR_UPPER(a,b) STACK_UPPER(&stack_grow_dir_detection, (a), (b)) #endif +#define IS_STACK_DIR_UPPER() STACK_DIR_UPPER(1,0) #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility push(default) diff --git a/thread_pthread.c b/thread_pthread.c index 0a37f2fa30..383d41b732 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1342,7 +1342,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr) } size /= 5; if (size > water_mark) size = water_mark; - if (STACK_DIR_UPPER(1, 0)) { + if (IS_STACK_DIR_UPPER()) { if (size > ~(size_t)base+1) size = ~(size_t)base+1; if (addr > base && addr <= (void *)((char *)base + size)) return 1; } |