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)

diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index 4d88bd199392586199104006a1c70acdd39f5098..346581519801a90bae31c7a7c4a4301dfb5cebd3 100644 (file)
--- 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>
 
 #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__)
 
     && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \
     && !defined(__ANDROID__) && !defined(__OpenBSD__)
 

diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 6fc7a7d0fa0cdac7521d56a301932d3e09abb28e..d6d1b58e1ff044222ea117ba25d779764f8e95c0 100644 (file)
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -25,7 +25,7 @@
 #include <openssl/ssl.h>
 #include <openssl/modes.h>
 
 #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>
 # undef ASYNC_POSIX
 # define ASYNC_POSIX
 # include <unistd.h>