diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-03-03 19:56:17 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-03-03 19:56:17 +0000 |
| commit | 3b3f71121b47e784039d8cde3dd594be02350c99 (patch) | |
| tree | 7e9aec005d0fbf5976e3158b3d5fd9a39723059d /apps/speed.c | |
| parent | 47333a34d5485fc7788fc121c0bf8e754f8ffc55 (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/speed.c')
| -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 9d7154f09f..539bfff220 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 |