[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  267d4fb1830ffd66fbc80a4e89e85ca67fdce3bb (commit)
      from  73a5150689571fb8374320a298c4082778d238f3 (commit)


- Log -----------------------------------------------------------------
commit 267d4fb1830ffd66fbc80a4e89e85ca67fdce3bb
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 10 02:08:22 2016 +0100

    Fix no-dso (shlibloadtest)
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 586b79d8884b171eb3fae1ef230572921715ce1a)

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

Summary of changes:
 test/shlibloadtest.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index eea2e3a..6f220ba 100644
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -12,6 +12,9 @@
 #include <stdlib.h>
 #include <openssl/opensslv.h>
 
+/* 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 <dlfcn.h>
@@ -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"