merges r22900 from trunk into ruby_1_9_1.

--
* process.c (rb_f_sleep): time() needs time_t.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 99f784ece5..584cca5c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 12 05:16:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_f_sleep): time() needs time_t.
+
 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
diff --git a/process.c b/process.c
index 0545e77b27..834520b608 100644
--- a/process.c
+++ b/process.c
@@ -2903,7 +2903,7 @@ rb_f_spawn(int argc, VALUE *argv)
 static VALUE
 rb_f_sleep(int argc, VALUE *argv)
 {
-    int beg, end;
+    time_t beg, end;
 
     beg = time(0);
     if (argc == 0) {