From c3126315f41e3e9ddfc10d7524f49641a42697ab Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 15 Jan 2018 19:05:01 +0100 Subject: [PATCH] The Cygwin gcc doesn't define _WIN32, don't pretend it does Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/5060) (cherry picked from commit 4d3c278c1a4f940e098edac6de3d370b94d1bb8b) --- crypto/cryptlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index f011b4b692..ccfdbdc97b 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -99,7 +99,7 @@ void OPENSSL_cpuid_setup(void) } #endif -#if defined(_WIN32) && !defined(__CYGWIN__) +#if defined(_WIN32) # include # include # ifdef __WATCOMC__ @@ -308,7 +308,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 /* -- 2.25.1