kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* process.c (rb_proc_times): rename hz to hertz to avoid name

Browse source 
crash on AIX.  [ruby-dev:29126]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-07-25 04:58:15 +00:00
parent c0e5d45a1e
commit cb657243da
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,17 +1,22 @@
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.
Mon Jul 24 15:19:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): revert last change. [ruby-dev:29112]
[ruby-core:08374]
Mon Jul 24 15:51:52 2006 Tanaka Akira <akr@fsij.org>
* ext/readline/readline.c (readline_readline): rl_deprep_term_function
may be NULL with libedit. reported by Ryan Davis. [ruby-dev:29070]
Mon Jul 24 15:19:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): revert last change. [ruby-dev:29112]
[ruby-core:08374]
Sun Jul 23 22:59:49 2006 Tanaka Akira <akr@fsij.org>
* test/socket/test_unix.rb: disabled on cygwin.

14
process.c
View file

@ -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