diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-25 04:58:15 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-25 04:58:15 +0000 |
commit | 8d73a890d3bab0032b0918b6be995d726a4dbb82 (patch) | |
tree | 8877e744a7d12053f8d650c967d0f8005c06a29c | |
parent | 8c217096f4f23409f3486c3775cd75ec9bd0e2ed (diff) |
* process.c (rb_proc_times): rename hz to hertz to avoid name
crash on AIX. [ruby-dev:29126]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | process.c | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -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. @@ -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 |