[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d4dfb0baf9d112ff4bdecf996348808bf806bb5f (commit)
      from  a16ca4e8aeef1178ce013569058afcec1f6ac77c (commit)


- Log -----------------------------------------------------------------
commit d4dfb0baf9d112ff4bdecf996348808bf806bb5f
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Jun 23 18:33:02 2015 -0400

    Fix windows build
    
    Move #include's inside the #ifdef.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/sec_mem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/sec_mem.c b/crypto/sec_mem.c
index ea9523b..5bf8baa 100644
--- a/crypto/sec_mem.c
+++ b/crypto/sec_mem.c
@@ -12,13 +12,13 @@
  */
 #include <openssl/crypto.h>
 #include <e_os.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
 
 #if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
 # define IMPLEMENTED
+# include <stdlib.h>
+# include <string.h>
+# include <assert.h>
+# include <unistd.h>
 # include <sys/mman.h>
 # include <sys/param.h>
 #endif