The Cygwin gcc doesn't define _WIN32, don't pretend it does
authorRichard Levitte <levitte@openssl.org>
Mon, 15 Jan 2018 18:05:01 +0000 (19:05 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 18 Jan 2018 13:00:06 +0000 (14:00 +0100)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5060)

crypto/cryptlib.c

index c2bd219..3a2b733 100644 (file)
@@ -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
     /*