summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-25 04:58:15 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-25 04:58:15 +0000
commitcb657243da67646d0e97d92c70b3b04afb7edac0 (patch)
tree567b6bc47a961ea480284ffbe3086c840e14ab01 /process.c
parentc0e5d45a1ef899bce5104ac95ff48ba3a5cb809c (diff)
downloadruby-cb657243da67646d0e97d92c70b3b04afb7edac0.tar.gz
* 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/trunk@10595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/process.c b/process.c
index 8d1f07de82..42b9d67e26 100644
--- a/process.c
+++ b/process.c
@@ -1597,11 +1597,11 @@ rb_f_system(int argc, VALUE *argv)
chfunc = signal(SIGCHLD, SIG_DFL);
#endif
status = rb_spawn(argc, argv);
- if (status > 0) {
#if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
+ if (status > 0) {
rb_syswait(status);
-#endif
}
+#endif
#ifdef SIGCHLD
signal(SIGCHLD, chfunc);
#endif
@@ -3531,7 +3531,7 @@ VALUE
rb_proc_times(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
@@ -3549,10 +3549,10 @@ rb_proc_times(VALUE 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