[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  568b80206a0a59e4e33abf569b9bef5f8564b36b (commit)
      from  0e04674e964b905e67e3d215bcf888932c92765f (commit)


- Log -----------------------------------------------------------------
commit 568b80206a0a59e4e33abf569b9bef5f8564b36b
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Sep 16 22:17:55 2015 -0400

    RT4033: Use OPENSSL_SYS_UNIX not "unix"
    
    Real fix for RT 4033
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.h   | 1 +
 apps/rehash.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/apps.h b/apps/apps.h
index 328f8fb..2d198a1 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 fdaba6a..c8bfb05 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__) */