From: Ben Laurie <ben@links.org>
Date: Fri, 31 Jul 2015 08:49:20 +0000 (+0100)
Subject: Only define PAGE_SIZE if not already defined.
X-Git-Tag: OpenSSL_1_1_0-pre1~866
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34750dc25d74e3db4c1ba43cd219d3f4825e4c65;p=oweals%2Fopenssl.git

Only define PAGE_SIZE if not already defined.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/sec_mem.c b/crypto/sec_mem.c
index 5bf8baace1..a630cbc82e 100644
--- a/crypto/sec_mem.c
+++ b/crypto/sec_mem.c
@@ -26,7 +26,9 @@
 #define LOCK()      CRYPTO_w_lock(CRYPTO_LOCK_MALLOC)
 #define UNLOCK()    CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC)
 #define CLEAR(p, s) OPENSSL_cleanse(p, s)
-#define PAGE_SIZE    4096
+#ifndef PAGE_SIZE
+# define PAGE_SIZE    4096
+#endif
 
 #ifdef IMPLEMENTED
 size_t secure_mem_used;