From: Richard Levitte <levitte@openssl.org>
Date: Thu, 11 Jan 2018 21:01:44 +0000 (+0100)
Subject: Cygwin is POSIX, don't say it isn't
X-Git-Tag: OpenSSL_1_1_0h~127
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df50dee414366bd609b1eadae8a0748e13a7226e;p=oweals%2Fopenssl.git

Cygwin is POSIX, don't say it isn't

More to the point, Cygwin is a POSIX API.  In our library, the use of
a POSIX API is marked by defining the macro OPENSSL_SYS_UNIX.
Therefore, that macro shouldn't be undefined when building for Cygwin.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5060)

(cherry picked from commit 33cebb9c0dd6115bc357b5097f7db82b64b10919)
---

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 4aec51f52b..e73665ee7b 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -49,7 +49,6 @@ extern "C" {
 #  define OPENSSL_SYS_WIN32_UWIN
 # else
 #  if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
-#   undef OPENSSL_SYS_UNIX
 #   define OPENSSL_SYS_WIN32_CYGWIN
 #  else
 #   if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)