From 285066dd0bc256fc6b197ac6e55c51b39a574924 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 26 Jun 2008 21:53:40 +0000 Subject: * 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 --- ChangeLog | 6 ++++++ configure.in | 2 +- process.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10e341bd72..f7625c1dc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 27 06:52:54 2008 Koichi Sasada + + * configure.in: need a ",". + + * process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro. + Fri Jun 27 06:50:56 2008 Koichi Sasada * 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)]) diff --git a/process.c b/process.c index 1f5fe62f4f..38011151dd 100644 --- a/process.c +++ b/process.c @@ -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); -- cgit v1.2.3