Make sure we get the definition of a number of OPENSSL_NO_* macros.

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index f1ccc0f0418ce72db3c7e795a110e2fac49f3f3a..53a8f6c758778711a174d57704539b8d73763ee7 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -64,6 +64,7 @@
 #ifndef HEADER_X509_H
 #define HEADER_X509_H
 
+#include <openssl/e_os2.h>
 #include <openssl/symhacks.h>
 #ifndef OPENSSL_NO_BUFFER
 #include <openssl/buffer.h>
@@ -104,7 +105,6 @@
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif
-#include <openssl/e_os2.h>
 #include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus

diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index f0be21f4525cfc1e47ef3787614f969a3911daf0..3a0ccbe48d3ea6a3448c64941b1e173255414af2 100644 (file)
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -65,6 +65,7 @@
 #ifndef HEADER_X509_VFY_H
 #define HEADER_X509_VFY_H
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_LHASH
 #include <openssl/lhash.h>
 #endif