summaryrefslogtreecommitdiff
path: root/thread_pthread.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:03:12 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:03:12 +0000
commitd21f0f423503c3dc00f1366198b1df44f6dd52d3 (patch)
tree9697bb427599aeefb20733d77ab3d5f9c66b8cb7 /thread_pthread.c
parent45b4a724131e171357343a563cae26ef55eb7945 (diff)
merges r22898 from trunk into ruby_1_9_1.
-- * thread_pthread.c (ruby_init_stack): range of rlim_cur may be larger than int. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23182 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 21c54bb703..e5ae3c1566 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -292,10 +292,10 @@ ruby_init_stack(VALUE *addr
struct rlimit rlim;
if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
- unsigned int space = rlim.rlim_cur/5;
+ size_t space = (size_t)(rlim.rlim_cur/5);
if (space > 1024*1024) space = 1024*1024;
- native_main_thread.stack_maxsize = rlim.rlim_cur - space;
+ native_main_thread.stack_maxsize = (size_t)rlim.rlim_cur - space;
}
}
#endif