aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-18 05:34:13 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-18 05:34:13 +0000
commit408b8110d5935df37a63db9ce6173a2f779b4e20 (patch)
treed7b7405eadcb088d06b75a9a6c7f260ea1b910cd
parent5da36600a192916c18b82ae56f0ea4ac496c2312 (diff)
downloadruby-408b8110d5935df37a63db9ce6173a2f779b4e20.tar.gz
* process.c (rb_clock_gettime): Rename POSIX_TIME_CLOCK_REALTIME to
ISO_C_TIME_CLOCK_REALTIME. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--process.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 96c48f107c..8f10a154d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 18 14:30:47 2013 Tanaka Akira <akr@fsij.org>
+
+ * process.c (rb_clock_gettime): Rename POSIX_TIME_CLOCK_REALTIME to
+ ISO_C_TIME_CLOCK_REALTIME.
+
Sun Aug 18 14:22:45 2013 Tanaka Akira <akr@fsij.org>
* configure.in: Revert r42604. It causes linking librt on systems
diff --git a/process.c b/process.c
index 8c628fed41..b1fe66d4e2 100644
--- a/process.c
+++ b/process.c
@@ -6682,7 +6682,7 @@ rb_proc_times(VALUE obj)
*
* Emulations for +:CLOCK_REALTIME+:
* [:POSIX_GETTIMEOFDAY_CLOCK_REALTIME] Use gettimeofday(). The resolution is 1 micro second.
- * [:POSIX_TIME_CLOCK_REALTIME] Use time(). The resolution is 1 second.
+ * [:ISO_C_TIME_CLOCK_REALTIME] Use time(). The resolution is 1 second.
*
* Emulations for +:CLOCK_MONOTONIC+:
* [:MACH_ABSOLUTE_TIME_CLOCK_MONOTONIC] Use mach_absolute_time(), available on Darwin.
@@ -6746,8 +6746,8 @@ rb_clock_gettime(int argc, VALUE *argv)
goto success;
}
-#define RUBY_POSIX_TIME_CLOCK_REALTIME ID2SYM(rb_intern("POSIX_TIME_CLOCK_REALTIME"))
- if (clk_id == RUBY_POSIX_TIME_CLOCK_REALTIME) {
+#define RUBY_ISO_C_TIME_CLOCK_REALTIME ID2SYM(rb_intern("ISO_C_TIME_CLOCK_REALTIME"))
+ if (clk_id == RUBY_ISO_C_TIME_CLOCK_REALTIME) {
time_t t;
t = time(NULL);
if (t == (time_t)-1)