[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  f1c00b93e2138e5a45e8b500dec6bb3b2e035771 (commit)
      from  b38fa9855f65477fb4a6ef943276be8237468e3b (commit)


- Log -----------------------------------------------------------------
commit f1c00b93e2138e5a45e8b500dec6bb3b2e035771
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 10 19:38:28 2018 +0100

    mem_sec.c: portability fixup.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index ab4d137..1c13270 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -33,8 +33,10 @@
 # include <sys/mman.h>
 # if defined(OPENSSL_SYS_LINUX)
 #  include <sys/syscall.h>
-#  include <linux/mman.h>
-#  include <errno.h>
+#  if defined(SYS_mlock2)
+#   include <linux/mman.h>
+#   include <errno.h>
+#  endif
 # endif
 # include <sys/param.h>
 # include <sys/stat.h>