[前][次][番号順一覧][スレッド一覧]

ruby-changes:15195

From: akr <ko1@a...>
Date: Sun, 28 Mar 2010 10:14:11 +0900 (JST)
Subject: [ruby-changes:15195] Ruby:r27075 (trunk): * time.c (rb_time_magnify): fix for LP64.

akr	2010-03-28 10:13:00 +0900 (Sun, 28 Mar 2010)

  New Revision: 27075

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

  Log:
    * time.c (rb_time_magnify): fix for LP64.

  Modified files:
    trunk/ChangeLog
    trunk/time.c

Index: time.c
===================================================================
--- time.c	(revision 27074)
+++ time.c	(revision 27075)
@@ -594,12 +594,22 @@
 #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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27074)
+++ ChangeLog	(revision 27075)
@@ -1,3 +1,7 @@
+Sun Mar 28 10:12:28 2010  Tanaka Akira  <akr@f...>
+
+	* time.c (rb_time_magnify): fix for LP64.
+
 Sun Mar 28 09:28:33 2010  NARUSE, Yui  <naruse@r...>
 
 	* lib/scanf.rb: fix %[egEFG] isn't accept.

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

[前][次][番号順一覧][スレッド一覧]