PR#1999 broke fork detection by assuming HAVE_FORK was set for all platforms.
Include original HAVE_FORK detection logic while allowing it to be
overridden on specific platforms with -DHAVE_FORK=1 or -DHAVE_FORK=0
This commit is contained in:
Dr. Stephen Henson 2010-03-03 19:56:17 +00:00
parent 47333a34d5
commit 3b3f71121b

View File

@ -184,12 +184,18 @@
#include <openssl/ecdh.h> #include <openssl/ecdh.h>
#endif #endif
#ifndef HAVE_FORK
# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE) # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
# define NO_FORK 1 # define HAVE_FORK 0
#elif HAVE_FORK # else
# define HAVE_FORK 1
# endif
#endif
#if HAVE_FORK
#undef NO_FORK #undef NO_FORK
#else #else
# define NO_FORK 1 #define NO_FORK
#endif #endif
#undef BUFSIZE #undef BUFSIZE