diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-26 21:53:40 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-26 21:53:40 +0000 |
commit | 285066dd0bc256fc6b197ac6e55c51b39a574924 (patch) | |
tree | 894ec8a14ecbc0535d94817a84fe200aead69112 | |
parent | d4cddaaa4ce60dd5d35e85da4436236a287a622b (diff) | |
download | ruby-285066dd0bc256fc6b197ac6e55c51b39a574924.tar.gz |
* configure.in: need a ",".
* process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | process.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Jun 27 06:52:54 2008 Koichi Sasada <ko1@atdot.net> + + * configure.in: need a ",". + + * process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro. + Fri Jun 27 06:50:56 2008 Koichi Sasada <ko1@atdot.net> * vm_eval.c (vm_call_super): fix to call method_missing. diff --git a/configure.in b/configure.in index 2b43c6878f..87b0b1a0aa 100644 --- a/configure.in +++ b/configure.in @@ -1159,7 +1159,7 @@ main(int argc, char *argv[]) } return EXIT_SUCCESS; -}] +}], rb_cv_fork_with_pthread=yes, rb_cv_fork_with_pthread=no, rb_cv_fork_with_pthread=yes)]) @@ -2412,7 +2412,7 @@ rb_fork(int *status, int (*chfunc)(void*), void *charg, VALUE fds) static VALUE rb_f_fork(VALUE obj) { -#if defined(HAVE_FORK) && !(defined(__NetBSD__) && __NetBSD_Version__ < 400000000) +#if defined(HAVE_FORK) && !defined(CANNOT_FORK_WITH_PTHREAD) rb_pid_t pid; rb_secure(2); |