yugui	2009-04-12 23:03:12 +0900 (Sun, 12 Apr 2009)

  New Revision: 23182

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23182

  Log:
    merges r22898 from trunk into ruby_1_9_1.
    --
    * thread_pthread.c (ruby_init_stack): range of rlim_cur may be
      larger than int.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/thread_pthread.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23181)
+++ ruby_1_9_1/ChangeLog	(revision 23182)
@@ -1,3 +1,11 @@
+Thu Mar 12 05:12:53 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
Index: ruby_1_9_1/thread_pthread.c
===================================================================
--- ruby_1_9_1/thread_pthread.c	(revision 23181)
+++ ruby_1_9_1/thread_pthread.c	(revision 23182)
@@ -292,10 +292,10 @@
 	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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/