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
This commit is contained in:
yugui 2009-04-12 14:03:12 +00:00
parent 45b4a72413
commit d21f0f4235
2 changed files with 10 additions and 2 deletions

View file

@ -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

View file

@ -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