There are two actual uses of e_os2.h in libssl - an OPENSSL_GLOBAL (an

empty define) and an OPENSSL_EXTERN (which is defined as, well... extern).
The use of OPENSSL_EXTERN is already inconsistent since the lines above
and below just use plain old "extern". Expand the two uses of these macros
and stop including e_os2.h in libssl.

ok miod@

1 files changed, 1 insertions, 3 deletions

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 012a38cc5c..fc9d6a1027 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -152,7 +152,6 @@
 #include <unistd.h>
 
 #include <openssl/opensslconf.h>
-#include <openssl/e_os2.h>
 #include <openssl/buffer.h>
 #ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
@@ -566,8 +565,7 @@ typedef struct ssl3_comp_st {
 #endif
 
 extern SSL3_ENC_METHOD ssl3_undef_enc_method;
-OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[];
-
+extern SSL_CIPHER ssl3_ciphers[];
 
 SSL_METHOD *ssl_bad_method(int ver);