summaryrefslogtreecommitdiffstats
path: root/process.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:03:21 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:03:21 +0000
commit01ca865551deb3597d5c882ae3ac35e85b48a9c6 (patch)
treec85a5baf757a5c76847dc68302158410a750ad41 /process.c
parent2019f1c0b5eb159cdbe99956a4a47cf30ab4da8c (diff)
downloadruby-01ca865551deb3597d5c882ae3ac35e85b48a9c6.tar.gz
ruby-01ca865551deb3597d5c882ae3ac35e85b48a9c6.tar.xz
ruby-01ca865551deb3597d5c882ae3ac35e85b48a9c6.zip
merges r22900 from trunk into ruby_1_9_1.
-- * process.c (rb_f_sleep): time() needs time_t. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/process.c b/process.c
index 0545e77b2..834520b60 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) {