From b71fa7b32d0d80dc1fa5fedf7f0b9a991d746c41 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 23 Mar 2018 01:05:23 +0100
Subject: [PATCH] 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)
---
 crypto/init.c        | 1 +
 test/build.info      | 2 +-
 test/shlibloadtest.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/init.c b/crypto/init.c
index 27be7b6123..a0bad564e6 100644
--- 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 ddd3e2028a..f6f36fa0b2 100644
--- 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 f759a3198c..ea5044e642 100644
--- 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;
-- 
2.25.1