Include "internal/dso_conf.h" where needed and appropriate
authorRichard Levitte <levitte@openssl.org>
Fri, 23 Mar 2018 00:05:23 +0000 (01:05 +0100)
committerRichard Levitte <levitte@openssl.org>
Fri, 23 Mar 2018 00:05:23 +0000 (01:05 +0100)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5733)

crypto/init.c
test/build.info
test/shlibloadtest.c

index 27be7b6..a0bad56 100644 (file)
@@ -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"
 
index ddd3e20..f6f36fa 100644 (file)
@@ -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
 
index f759a31..ea5044e 100644 (file)
@@ -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;