Include "internal/dso_conf.h" where needed and appropriate

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5733)

diff --git a/crypto/init.c b/crypto/init.c
index 27be7b6123f0c452c134967e9133f7c51c71dee9..a0bad564e64cb9ee299ab9b6e4f62948d08ad726 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "internal/thread_once.h"
+#include "internal/dso_conf.h"
 #include "internal/dso.h"
 #include "internal/store.h"
 

diff --git a/test/build.info b/test/build.info
index ddd3e2028aaa969d2bcfe63f02a8d48044b99767..f6f36fa0b28a2b6c6d438e91d6489f5a6600a284 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -378,7 +378,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
   IF[{- !$disabled{shared} -}]
     PROGRAMS_NO_INST=shlibloadtest
     SOURCE[shlibloadtest]=shlibloadtest.c
-    INCLUDE[shlibloadtest]=../include
+    INCLUDE[shlibloadtest]=../include ../crypto/include
     DEPEND[shlibloadtest]=libtestutil.a
   ENDIF
 

diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index f759a3198c40ee26034a818ddbc5b89bdfbd85bc..ea5044e642a2670a9edefbf95ad51ed79128a34f 100644 (file)
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -13,6 +13,7 @@
 #include <openssl/opensslv.h>
 #include <openssl/ssl.h>
 #include <openssl/ossl_typ.h>
+#include "internal/dso_conf.h"
 #include "testutil.h"
 
 typedef void DSO;