diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-28 01:13:00 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-28 01:13:00 +0000 |
commit | d8cc6ccb566a4f302bd85c7a568eda0e434dd8d1 (patch) | |
tree | a33a7fcb66767f2a96256b7606c0c92f346dc33d | |
parent | 63dd50961e08172bb88358d95d50efee4c6eead0 (diff) |
* time.c (rb_time_magnify): fix for LP64.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | time.c | 14 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Mar 28 10:12:28 2010 Tanaka Akira <akr@fsij.org> + + * time.c (rb_time_magnify): fix for LP64. + Sun Mar 28 09:28:33 2010 NARUSE, Yui <naruse@ruby-lang.org> * lib/scanf.rb: fix %[egEFG] isn't accept. @@ -594,12 +594,22 @@ rb_time_magnify(VALUE v) #else long a, b, c; a = FIX2LONG(v); - if (a == 0) - return x; + if (a == 0) { +#if WIDEINT_IS_UINT64 + WIDEVAL_SET(ret, INT64toFIXWV(0)); +#else + WIDEVAL_SET(ret, INT2FIX(0)); +#endif + return ret; + } b = TIME_SCALE; c = a * b; if (c / a == b) { +#if WIDEINT_IS_UINT64 WIDEVAL_SET(ret, INT64toFIXWV(c)); +#else + WIDEVAL_SET(ret, LONG2NUM(c)); +#endif return ret; } #endif |