diff options
author | Richard Levitte <levitte@openssl.org> | 2018-01-15 19:05:01 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-01-18 14:00:06 +0100 |
commit | 4d3c278c1a4f940e098edac6de3d370b94d1bb8b (patch) | |
tree | 1895671b0fa999276703210f382cd0facce1c7c3 /crypto | |
parent | 6ce66ce073b19af46fd94f4eefdb7c4772d7dd6f (diff) |
The Cygwin gcc doesn't define _WIN32, don't pretend it does
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5060)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/cryptlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index c2bd2193b7..3a2b733f5e 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -105,7 +105,7 @@ void OPENSSL_cpuid_setup(void) } #endif -#if defined(_WIN32) && !defined(__CYGWIN__) +#if defined(_WIN32) # include <tchar.h> # include <signal.h> # ifdef __WATCOMC__ @@ -320,7 +320,7 @@ void OPENSSL_die(const char *message, const char *file, int line) { OPENSSL_showfatal("%s:%d: OpenSSL internal error: %s\n", file, line, message); -#if !defined(_WIN32) || defined(__CYGWIN__) +#if !defined(_WIN32) abort(); #else /* |