From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 3 Mar 2010 19:56:00 +0000 (+0000)
Subject: PR: 2183
X-Git-Tag: OpenSSL_0_9_8n~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b7c114f0447519561fa87ba579fdc35b4496c4ca;p=oweals%2Fopenssl.git

PR: 2183

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
---

diff --git a/apps/speed.c b/apps/speed.c
index 07f0ae04a6..393a7baade 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -254,12 +254,18 @@
 # endif
 #endif
 
-#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
-#elif HAVE_FORK
+#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)
+#  define HAVE_FORK 0
+# else
+#  define HAVE_FORK 1
+# endif
+#endif
+
+#if HAVE_FORK
 # undef NO_FORK
 #else
-# define NO_FORK 1
+# define NO_FORK
 #endif
 
 #undef BUFSIZE