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:00 +00:00
parent ede1351997
commit b7c114f044

View File

@@ -254,12 +254,18 @@
# endif # endif
#endif #endif
#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE) #ifndef HAVE_FORK
# define NO_FORK 1 # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
#elif HAVE_FORK # define HAVE_FORK 0
# 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