summaryrefslogtreecommitdiff
path: root/thread_pthread.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-14 07:29:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-14 07:29:04 +0000
commit95c52c8e6c2e0ac8ea690ca8ae5141a0fde49e24 (patch)
tree0d076ae473cc4637278c373d6979e955f0c97450 /thread_pthread.c
parent92496d73eb68bcdd062251a7fb2cb994e0086780 (diff)
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r--thread_pthread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/thread_pthread.c b/thread_pthread.c
index 8cfc637735..e6295db3cb 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -221,7 +221,7 @@ get_stack(void **addr, size_t *size)
# 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 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
}
#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 {