merges r21181 from trunk into ruby_1_9_1.

* process.c (rb_waitpid): retries waitpid when EINTR.
  [ruby-core:19744].

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

1 files changed, 4 insertions, 5 deletions

diff --git a/process.c b/process.c
index 584f005620..11c7c23144 100644
--- a/process.c
+++ b/process.c
@@ -624,18 +624,17 @@ rb_waitpid(rb_pid_t pid, int *st, int flags)
 #ifndef NO_WAITPID
     struct waitpid_arg arg;
 
+retry:
     arg.pid = pid;
     arg.st = st;
     arg.flags = flags;
     result = (rb_pid_t)rb_thread_blocking_region(rb_waitpid_blocking, &arg,
 						 RUBY_UBF_PROCESS, 0);
     if (result < 0) {
-#if 0
 	if (errno == EINTR) {
-	    rb_thread_polling();
-	    goto retry;
-	}
-#endif
+            RUBY_VM_CHECK_INTS();
+            goto retry;
+        }
 	return -1;
     }
 #else  /* NO_WAITPID */