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
  <shinichiro.hamaji AT gmail.com> at [ruby-dev:38054].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/process.c b/process.c
index be2342abe2..9070a94d31 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