From 7983a48d66acec568fceb1d566f631a998d72b52 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 22 Mar 2003 01:45:51 +0000 Subject: merge from trunk --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fork.cc | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f2b5123f846..d6d67c905a0 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2003-03-21 Christopher Faylor + + * fork.cc: Conditionalize use of slow_pid_reuse throughout. It's not + necessary for newer versions of bash. + 2003-03-20 Corinna Vinschen * fhandler_socket.cc (fhandler_socket::sendto): Restrict EPIPE and diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index 7639a621d47..93f7061607b 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -325,6 +325,7 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls) return 0; } +#ifdef SLOW_PID_REUSE static void slow_pid_reuse (HANDLE h) { @@ -349,6 +350,7 @@ slow_pid_reuse (HANDLE h) } nfork_procs++; } +#endif static int __stdcall fork_parent (HANDLE& hParent, dll *&first_dll, @@ -537,7 +539,9 @@ fork_parent (HANDLE& hParent, dll *&first_dll, goto cleanup; } +#ifdef SLOW_PID_REUSE slow_pid_reuse (pi.hProcess); +#endif /* Wait for subproc to initialize itself. */ if (!sync_with_child (pi, subproc_ready, TRUE, "waiting for longjmp")) -- cgit v1.2.1