From: Richard Levitte Date: Thu, 10 Nov 2016 01:08:22 +0000 (+0100) Subject: Fix no-dso (shlibloadtest) X-Git-Tag: OpenSSL_1_1_1-pre1~3116 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=586b79d8884b171eb3fae1ef230572921715ce1a Fix no-dso (shlibloadtest) Reviewed-by: Matt Caswell --- diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c index eea2e3ae1c..6f220ba530 100644 --- a/test/shlibloadtest.c +++ b/test/shlibloadtest.c @@ -12,6 +12,9 @@ #include #include +/* The test is only currently implemented for DSO_DLFCN and DSO_WIN32 */ +#if defined(DSO_DLFCN) || defined(DSO_WIN32) + #define SSL_CTX_NEW "SSL_CTX_new" #define SSL_CTX_FREE "SSL_CTX_free" #define TLS_METHOD "TLS_method" @@ -35,7 +38,6 @@ static SSL_CTX_free_t SSL_CTX_free; static ERR_get_error_t ERR_get_error; static OpenSSL_version_num_t OpenSSL_version_num; - #ifdef DSO_DLFCN # include @@ -103,9 +105,6 @@ static int shlib_close(SHLIB lib) #endif -/* The test is only currently implemented for DSO_DLFCN and DSO_WIN32 */ -#if defined(DSO_DLFCN) || defined(DSO_WIN32) - # define CRYPTO_FIRST_OPT "-crypto_first" # define SSL_FIRST_OPT "-ssl_first" # define JUST_CRYPTO_OPT "-just_crypto"