QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-21 13:59:40 +00:00
Code Issues Projects Releases Wiki Activity

Simplify Cygwin checks, part 1

Browse Source 
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)
This commit is contained in:
Richard Levitte 2018-01-15 19:04:17 +01:00
parent 33cebb9c0d
commit 6ce66ce073
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/async/arch/async_posix.h
View File

@ -11,7 +11,7 @@
#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H #define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H
#include <openssl/e_os2.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(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \
&& !defined(__ANDROID__) && !defined(__OpenBSD__) && !defined(__ANDROID__) && !defined(__OpenBSD__)

2
engines/e_dasync.c
View File

@ -25,7 +25,7 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/modes.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 # undef ASYNC_POSIX
# define ASYNC_POSIX # define ASYNC_POSIX
# include <unistd.h> # include <unistd.h>