From: Rich Salz <rsalz@akamai.com>
Date: Thu, 17 Sep 2015 02:17:55 +0000 (-0400)
Subject: RT4033: Use OPENSSL_SYS_UNIX not "unix"
X-Git-Tag: OpenSSL_1_1_0-pre1~608
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=568b80206a0a59e4e33abf569b9bef5f8564b36b;p=oweals%2Fopenssl.git

RT4033: Use OPENSSL_SYS_UNIX not "unix"

Real fix for RT 4033

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/apps/apps.h b/apps/apps.h
index 328f8fb55a..2d198a104f 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -115,6 +115,7 @@
 # include "e_os.h"
 # include <assert.h>
 
+# include <openssl/e_os2.h>
 # include <openssl/bio.h>
 # include <openssl/x509.h>
 # include <openssl/lhash.h>
diff --git a/apps/rehash.c b/apps/rehash.c
index fdaba6af30..c8bfb05b78 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -59,7 +59,7 @@
 
 #include "apps.h"
 
-#if defined(unix) || defined(__APPLE__)
+#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__)
 # include <unistd.h>
 # include <stdio.h>
 # include <limits.h>
@@ -488,4 +488,4 @@ int rehash_main(int argc, char **argv)
     return (1);
 }
 
-#endif /* defined(unix) || defined(__APPLE__) */
+#endif /* defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) */