Since asn1.h gets included recursively from many places, the easiest

is to have asn1.h include e_os.h and e_os2.h.  Of course, this makes
the unofficial "non-export" status of e_os.h a bit delicate...

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 4646f05da55f9c6ae861d9cb63a32f9543282b80..2d0539b61291f47233630e1c0d130a3b7355fb1b 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -70,6 +70,9 @@
 
 #include <openssl/symhacks.h>
 
 
 #include <openssl/symhacks.h>
 

+#include <openssl/e_os.h>
+#include <openssl/e_os2.h>
+

 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
 # define OPENSSL_EXTERN OPENSSL_EXPORT
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
 # define OPENSSL_EXTERN OPENSSL_EXPORT