summaryrefslogtreecommitdiffstats
path: root/time.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-18 09:30:17 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-18 09:30:17 +0000
commite13dfab48ca779187db8d5a617c88f3b53a349d2 (patch)
treee743c8f2d5351bb408a01a5b9ee7a06f55dae732 /time.c
parenta37cafd0993763427d1d3631bf184491fc8bfbd5 (diff)
downloadruby-e13dfab48ca779187db8d5a617c88f3b53a349d2.tar.gz
ruby-e13dfab48ca779187db8d5a617c88f3b53a349d2.tar.xz
ruby-e13dfab48ca779187db8d5a617c88f3b53a349d2.zip
* time.c (time_minus): fix Time.at(2**60+1) - Time.at(2**60).
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/time.c b/time.c
index 7d09c289e..dc71a93c0 100644
--- a/time.c
+++ b/time.c
@@ -1320,9 +1320,11 @@ time_minus(VALUE time1, VALUE time2)
double f;
GetTimeval(time2, tobj2);
- f = (double)tobj->tv.tv_sec - (double)tobj2->tv.tv_sec;
+ if (tobj->tv.tv_sec < tobj2->tv.tv_sec)
+ f = -(double)(unsigned_time_t)(tobj2->tv.tv_sec - tobj->tv.tv_sec);
+ else
+ f = (double)(unsigned_time_t)(tobj->tv.tv_sec - tobj2->tv.tv_sec);
f += ((double)tobj->tv.tv_usec - (double)tobj2->tv.tv_usec)*1e-6;
- /* XXX: should check float overflow on 64bit time_t platforms */
return DOUBLE2NUM(f);
}