From 1daf1f522a26bc92ef488c760b18c65ff223b0af Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 22 May 2014 17:43:52 +0000 Subject: 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@ --- src/lib/libssl/ssl_locl.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/lib/libssl/ssl_locl.h') 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 #include -#include #include #ifndef OPENSSL_NO_COMP #include @@ -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); -- cgit v1.2.3-55-g6feb