aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-23 11:53:12 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-23 11:53:12 +0000
commitbf9ce0429f3a5414796e4a5808e00dc5275d70e1 (patch)
tree62786ee34370f7bed7042a156efb32def866a4e7
parent49b9f61fdb76478e4f54976c57945077db3c7ccc (diff)
downloadruby-bf9ce0429f3a5414796e4a5808e00dc5275d70e1.tar.gz
Fix the previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--process.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6914f4b021..bda879948d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Fri Aug 23 19:40:50 2013 Tanaka Akira <akr@fsij.org>
+Fri Aug 23 20:50:40 2013 Tanaka Akira <akr@fsij.org>
* process.c (gcd_ul): New function.
(reduce_fraction): Ditto.
diff --git a/process.c b/process.c
index 1ffb7752ef..6c8e7b235c 100644
--- a/process.c
+++ b/process.c
@@ -6888,7 +6888,6 @@ make_clock_result(struct timetick *ttp, unsigned long numerator, unsigned long d
VALUE
rb_clock_gettime(int argc, VALUE *argv)
{
- struct timespec ts;
VALUE clk_id, unit;
int ret;
@@ -7006,13 +7005,14 @@ rb_clock_gettime(int argc, VALUE *argv)
tt.count = t % 1000000000;
tt.giga_count = t / 1000000000;
numerator = sTimebaseInfo.numer;
- denominator = sTimebaseInfo.denom;
+ denominator = sTimebaseInfo.denom * 1000000000;
goto success;
}
#endif
}
else {
#if defined(HAVE_CLOCK_GETTIME)
+ struct timespec ts;
clockid_t c;
c = NUM2CLOCKID(clk_id);
ret = clock_gettime(c, &ts);