summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--thread_pthread.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bd2266fb7..99f784ece5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 12 05:12:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread_pthread.c (ruby_init_stack): range of rlim_cur may be
+ larger than int.
+
+ * missing/vsnprintf.c (BSD_vfprintf): commented out code which has
+ no effect at all.
+
Wed Mar 11 20:13:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
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