From 7139232649fd0e8ab7c4b0f420a6ed2e786f45e1 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 3 Mar 2009 11:39:44 +0000 Subject: merges r22587 from trunk into ruby_1_9_1. -- * process.c (rb_waitpid): last argument was missing. * process.c (waitall_each): fixed typo. a patch from shinichiro.h at [ruby-dev:38054]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ process.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e291206ed..46cf0655a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 24 10:49:37 2009 Nobuyoshi Nakada + + * process.c (rb_waitpid): last argument was missing. + + * process.c (waitall_each): fixed typo. a patch from shinichiro.h + at [ruby-dev:38054]. + Tue Feb 24 01:22:19 2009 Yusuke Endoh * bootstraptest/test_thread.rb: fix for environment where fork is not diff --git a/process.c b/process.c index be2342abe..9070a94d3 100644 --- a/process.c +++ b/process.c @@ -650,7 +650,7 @@ retry: for (;;) { result = (rb_pid_t)rb_thread_blocking_region(rb_waitpid_blocking, - st, RUBY_UBF_PROCESS); + st, RUBY_UBF_PROCESS, 0); if (result < 0) { if (errno == EINTR) { rb_thread_schedule(); @@ -693,7 +693,7 @@ static int waitall_each(rb_pid_t pid, int status, VALUE ary) { rb_last_status_set(status, pid); - rb_ary_push(ary, rb_assoc_new(PIDT2NUM(pid), rb_last_status_get()); + rb_ary_push(ary, rb_assoc_new(PIDT2NUM(pid), rb_last_status_get())); return ST_DELETE; } #endif -- cgit