diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-03-03 19:56:34 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-03-03 19:56:34 +0000 |
| commit | ebaa2cf5b20d9048f47c4687b2130f8d6751a964 (patch) | |
| tree | a003c2155572527152bbfa827087979c0369e60e /apps | |
| parent | cca1cd9a3447dd067503e4a85ebd1679ee78a48e (diff) | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/speed.c b/apps/speed.c index e4389f8a5a..1882239ce3 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -184,12 +184,18 @@ #include <openssl/ecdh.h> #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 -# undef NO_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 |