aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-10 12:13:33 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-10 12:13:33 +0000
commit4fa66dc53ba7e6c975c71a7419e6081352dea250 (patch)
treeadef9974d9ddc487f6ae0eb469343757b05821ce
parentf589733a025de87929cf0b8f624aefc40faa63e8 (diff)
downloadruby-4fa66dc53ba7e6c975c71a7419e6081352dea250.tar.gz
* process.c (rb_fork): call rb_fork_internal instead of rb_fork_err.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--process.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b62453dce3..28f3328fae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 10 21:13:10 2012 Tanaka Akira <akr@fsij.org>
+
+ * process.c (rb_fork): call rb_fork_internal instead of rb_fork_err.
+
Sun Jun 10 20:55:59 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_fork_ruby): call rb_fork_internal directly.
diff --git a/process.c b/process.c
index f49598ede4..63cd0fd424 100644
--- a/process.c
+++ b/process.c
@@ -3003,10 +3003,10 @@ rb_fork(int *status, int (*chfunc)(void*), void *charg, VALUE fds)
struct chfunc_wrapper_t warg;
warg.chfunc = chfunc;
warg.arg = charg;
- return rb_fork_err(status, chfunc_wrapper, &warg, fds, NULL, 0);
+ return rb_fork_internal(status, chfunc_wrapper, &warg, FALSE, fds, NULL, 0);
}
else {
- return rb_fork_err(status, NULL, NULL, fds, NULL, 0);
+ return rb_fork_internal(status, NULL, NULL, FALSE, fds, NULL, 0);
}
}