diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-11 10:23:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-11 10:23:26 +0100 |
| commit | 6e290a25c2cbdc26119c0866c20d9292f9e64dd8 (patch) | |
| tree | d7fd4eef41256572f0c588d305be18f5989210da /crypto/init.c | |
| parent | 588d2375a29bd128ff91b9bd2b7bf659a5f48c1a (diff) | |
| download | openssl-6e290a25c2cbdc26119c0866c20d9292f9e64dd8.tar.gz | |
Fix the effect of no-dso in crypto/init.c
When configured no-dso, there are no DSO_{whatever} macros defined.
Therefore, before checking those, you have to check if OPENSSL_NO_DSO
is defined.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1902)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index 4363beeb1d..e457b2dd0e 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -81,7 +81,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_base) OPENSSL_cpuid_setup(); base_inited = 1; -#ifndef OPENSSL_USE_NODELETE +#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) # ifdef DSO_WIN32 { HMODULE handle = NULL; @@ -604,7 +604,7 @@ int OPENSSL_atexit(void (*handler)(void)) { OPENSSL_INIT_STOP *newhand; -#ifndef OPENSSL_USE_NODELETE +#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) { union { void *sym; |