From: Richard Levitte <levitte@openssl.org>
Date: Mon, 15 Jan 2018 18:05:01 +0000 (+0100)
Subject: The Cygwin gcc doesn't define _WIN32, don't pretend it does
X-Git-Tag: OpenSSL_1_1_0h~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c3126315f41e3e9ddfc10d7524f49641a42697ab;p=oweals%2Fopenssl.git

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)

(cherry picked from commit 4d3c278c1a4f940e098edac6de3d370b94d1bb8b)
---

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 <tchar.h>
 # include <signal.h>
 # 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
     /*