summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--process.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ec7df7991c..cd573aa60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 25 13:14:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * process.c (rb_proc_times): rename hz to hertz to avoid name
+ crash on AIX. [ruby-dev:29126]
+
Mon Jul 24 22:03:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (backtrace): skip frames successive on node and method name.
diff --git a/process.c b/process.c
index 76720977c8..9192f4e1ce 100644
--- a/process.c
+++ b/process.c
@@ -3438,7 +3438,7 @@ rb_proc_times(obj)
VALUE obj;
{
#if defined(HAVE_TIMES) && !defined(__CHECKER__)
- const double hz =
+ const double hertz =
#ifdef HAVE__SC_CLK_TCK
(double)sysconf(_SC_CLK_TCK);
#else
@@ -3456,10 +3456,10 @@ rb_proc_times(obj)
times(&buf);
return rb_struct_new(S_Tms,
- utime = rb_float_new(buf.tms_utime / hz),
- stime = rb_float_new(buf.tms_stime / hz),
- cutime = rb_float_new(buf.tms_cutime / hz),
- sctime = rb_float_new(buf.tms_cstime / hz));
+ utime = rb_float_new(buf.tms_utime / hertz),
+ stime = rb_float_new(buf.tms_stime / hertz),
+ cutime = rb_float_new(buf.tms_cutime / hertz),
+ sctime = rb_float_new(buf.tms_cstime / hertz));
#else
rb_notimplement();
#endif