diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-15 19:04:17 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-18 14:00:06 +0100 |
| commit | 6ce66ce073b19af46fd94f4eefdb7c4772d7dd6f (patch) | |
| tree | 55ab3bdfce8532da3447591a30e3651cc039bbb5 | |
| parent | 33cebb9c0dd6115bc357b5097f7db82b64b10919 (diff) | |
| download | openssl-new-6ce66ce073b19af46fd94f4eefdb7c4772d7dd6f.tar.gz | |
Simplify Cygwin checks, part 1
Because OPENSSL_SYS_CYGWIN will keep OPENSSL_SYS_UNIX defined, there's
no point having checks of this form:
#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN))
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5060)
| -rw-r--r-- | crypto/async/arch/async_posix.h | 2 | ||||
| -rw-r--r-- | engines/e_dasync.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h index 4d88bd1993..3465815198 100644 --- a/crypto/async/arch/async_posix.h +++ b/crypto/async/arch/async_posix.h @@ -11,7 +11,7 @@ #define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H #include <openssl/e_os2.h> -#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) \ +#if defined(OPENSSL_SYS_UNIX) \ && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \ && !defined(__ANDROID__) && !defined(__OpenBSD__) diff --git a/engines/e_dasync.c b/engines/e_dasync.c index 6fc7a7d0fa..d6d1b58e1f 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -25,7 +25,7 @@ #include <openssl/ssl.h> #include <openssl/modes.h> -#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) +#if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS) # undef ASYNC_POSIX # define ASYNC_POSIX # include <unistd.h> |