[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5278dec375c9a2d991db4c533b60e09c6c80e6e3 (commit)
      from  55b2258859da5e8156dc9091911ce182945291fe (commit)


- Log -----------------------------------------------------------------
commit 5278dec375c9a2d991db4c533b60e09c6c80e6e3
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Sep 7 21:39:44 2015 -0400

    add support for apple os/x
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/apps/rehash.c b/apps/rehash.c
index 04827f2..b235e1b 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -2,7 +2,6 @@
  * C implementation based on the original Perl and shell versions
  *
  * Copyright (c) 2013-2014 Timo Teräs <timo.teras at iki.fi>
- * All rights reserved.
  */
 /* ====================================================================
  * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
@@ -60,7 +59,7 @@
 
 #include "apps.h"
 
-#ifdef unix
+#if defined(unix) || defined(__APPLE__)
 # include <unistd.h>
 # include <stdio.h>
 # include <limits.h>
@@ -480,4 +479,4 @@ int rehash_main(int argc, char **argv)
     return (1);
 }
 
-#endif
+#endif /* defined(unix) || defined(__APPLE__) */