summaryrefslogtreecommitdiffstats
path: root/crypto/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-02-29 16:14:00 +0000
committerMatt Caswell <matt@openssl.org>2016-03-07 13:36:17 +0000
commit15457b620397d7fd671df6eea8055a18baf68699 (patch)
tree89b185b0e9cc73910bd6e9547e69bb0b353459cf /crypto/include
parent8da00a38cd931f66ad4f1aaae6003d4dd6bc65c0 (diff)
Fix OPENSSL_INIT flags to avoid a clash.
The 0x00010000L OPENSSL_INIT flag appeared twice. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/include')
-rw-r--r--crypto/include/internal/cryptlib_int.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/include/internal/cryptlib_int.h b/crypto/include/internal/cryptlib_int.h
index 0e457623ff..ae30842d6d 100644
--- a/crypto/include/internal/cryptlib_int.h
+++ b/crypto/include/internal/cryptlib_int.h
@@ -70,7 +70,7 @@ int ossl_init_thread_start(uint64_t opts);
* are those ommitted from crypto.h because they are "reserverd for internal
* use".
*/
-# define OPENSSL_INIT_ZLIB 0x010000
+# define OPENSSL_INIT_ZLIB 0x00010000L
/* OPENSSL_INIT_THREAD flags */
# define OPENSSL_INIT_THREAD_ASYNC 0x01