Almost nothing actually needs to include <openssl/e_os2.h>, however by

including it they get <openssl/opensslconf.h>. So instead of pulling in
<openssl/e_os2.h>, just pull in <openssl/opensslconf.h>.

"go ahead" miod@

2 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index e7264ccb09..5d2a7b4418 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -60,7 +60,9 @@
 #define HEADER_ASN1_H
 
 #include <time.h>
-#include <openssl/e_os2.h>
+
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
diff --git a/src/lib/libcrypto/asn1/asn1t.h b/src/lib/libcrypto/asn1/asn1t.h
index 21d41bc11e..1b9d4eb40c 100644
--- a/src/lib/libcrypto/asn1/asn1t.h
+++ b/src/lib/libcrypto/asn1/asn1t.h
@@ -59,7 +59,9 @@
 #define HEADER_ASN1T_H
 
 #include <stddef.h>
-#include <openssl/e_os2.h>
+
+#include <openssl/opensslconf.h>
+
 #include <openssl/asn1.h>
 
 /* ASN1 template defines, structures and functions */