diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:39:44 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:39:44 +0000 |
| commit | 7139232649fd0e8ab7c4b0f420a6ed2e786f45e1 (patch) | |
| tree | fbdb96b2b2e0887fc7c364e1844eb01fd993a4e0 | |
| parent | 1544df59ba1a7a3e0bb0d71ae2735431b1c026a9 (diff) | |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | process.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Tue Feb 24 10:49:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@tsg.ne.jp> * bootstraptest/test_thread.rb: fix for environment where fork is not @@ -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 |