yugui	2009-03-03 20:39:44 +0900 (Tue, 03 Mar 2009)

  New Revision: 22734

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22734

  Log:
    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].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/process.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22733)
+++ ruby_1_9_1/ChangeLog	(revision 22734)
@@ -1,3 +1,10 @@
+Tue Feb 24 10:49:37 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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].
+
 Tue Feb 24 01:22:19 2009  Yusuke Endoh  <mame@t...>
 
 	* bootstraptest/test_thread.rb: fix for environment where fork is not
Index: ruby_1_9_1/process.c
===================================================================
--- ruby_1_9_1/process.c	(revision 22733)
+++ ruby_1_9_1/process.c	(revision 22734)
@@ -650,7 +650,7 @@
 
     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 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/