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 328f8fb55a1037a25c1cbf78c7ac72a900638d58..2d198a104fa005956e9ffb12d50735f4614ecd16 100644 (file)
--- 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 fdaba6af3035c6d210b59173d262b4880e972942..c8bfb05b78200ea76629858002dce5149858da99 100644 (file)
--- 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__) */