From edd3ff8398c67ebf3f6c577069851a8d3f457a5c Mon Sep 17 00:00:00 2001 From: miod Date: Sun, 27 Apr 2014 20:22:30 +0000 Subject: [PATCH] Unifdef -U OPENSSL_BUILD_SHLIBCRYPTO, since all it causes under Unix is to redefine OPENSSL_EXTERN from `extern' to `extern'. --- lib/libcrypto/asn1/asn1.h | 5 ----- lib/libcrypto/asn1/asn1t.h | 5 ----- lib/libcrypto/des/des.h | 4 ---- lib/libcrypto/des/des_locl.h | 12 +----------- lib/libcrypto/des/des_ver.h | 5 ----- lib/libssl/src/crypto/asn1/asn1.h | 5 ----- lib/libssl/src/crypto/asn1/asn1t.h | 5 ----- lib/libssl/src/crypto/des/des.h | 4 ---- lib/libssl/src/crypto/des/des_locl.h | 12 +----------- lib/libssl/src/crypto/des/des_ver.h | 5 ----- lib/libssl/src/ssl/ssl_locl.h | 5 ----- lib/libssl/ssl_locl.h | 5 ----- 12 files changed, 2 insertions(+), 70 deletions(-) diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h index 868f9c059fa..176a3d5b822 100644 --- a/lib/libcrypto/asn1/asn1.h +++ b/lib/libcrypto/asn1/asn1.h @@ -72,11 +72,6 @@ #include #endif -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libcrypto/asn1/asn1t.h b/lib/libcrypto/asn1/asn1t.h index d230e4bf700..fcb3c5cf9ac 100644 --- a/lib/libcrypto/asn1/asn1t.h +++ b/lib/libcrypto/asn1/asn1t.h @@ -62,11 +62,6 @@ #include #include -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - /* ASN1 template defines, structures and functions */ #ifdef __cplusplus diff --git a/lib/libcrypto/des/des.h b/lib/libcrypto/des/des.h index 122fc1403c6..3eff114102f 100644 --- a/lib/libcrypto/des/des.h +++ b/lib/libcrypto/des/des.h @@ -66,10 +66,6 @@ #error DES is disabled. #endif -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif #ifdef __cplusplus extern "C" { diff --git a/lib/libcrypto/des/des_locl.h b/lib/libcrypto/des/des_locl.h index 1b0c53038c4..1a21467b3eb 100644 --- a/lib/libcrypto/des/des_locl.h +++ b/lib/libcrypto/des/des_locl.h @@ -61,24 +61,14 @@ #include - #include #include +#include #include #include #include - -#if defined(__STDC__) -#include -#endif - -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #define ITERATIONS 16 #define HALF_ITERATIONS 8 diff --git a/lib/libcrypto/des/des_ver.h b/lib/libcrypto/des/des_ver.h index d1ada258a65..b4a6ffdc39e 100644 --- a/lib/libcrypto/des/des_ver.h +++ b/lib/libcrypto/des/des_ver.h @@ -58,11 +58,6 @@ #include -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - /* The following macros make sure the names are different from libdes names */ #define DES_version OSSL_DES_version #define libdes_version OSSL_libdes_version diff --git a/lib/libssl/src/crypto/asn1/asn1.h b/lib/libssl/src/crypto/asn1/asn1.h index 868f9c059fa..176a3d5b822 100644 --- a/lib/libssl/src/crypto/asn1/asn1.h +++ b/lib/libssl/src/crypto/asn1/asn1.h @@ -72,11 +72,6 @@ #include #endif -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libssl/src/crypto/asn1/asn1t.h b/lib/libssl/src/crypto/asn1/asn1t.h index d230e4bf700..fcb3c5cf9ac 100644 --- a/lib/libssl/src/crypto/asn1/asn1t.h +++ b/lib/libssl/src/crypto/asn1/asn1t.h @@ -62,11 +62,6 @@ #include #include -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - /* ASN1 template defines, structures and functions */ #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/des/des.h b/lib/libssl/src/crypto/des/des.h index 122fc1403c6..3eff114102f 100644 --- a/lib/libssl/src/crypto/des/des.h +++ b/lib/libssl/src/crypto/des/des.h @@ -66,10 +66,6 @@ #error DES is disabled. #endif -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif #ifdef __cplusplus extern "C" { diff --git a/lib/libssl/src/crypto/des/des_locl.h b/lib/libssl/src/crypto/des/des_locl.h index 1b0c53038c4..1a21467b3eb 100644 --- a/lib/libssl/src/crypto/des/des_locl.h +++ b/lib/libssl/src/crypto/des/des_locl.h @@ -61,24 +61,14 @@ #include - #include #include +#include #include #include #include - -#if defined(__STDC__) -#include -#endif - -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #define ITERATIONS 16 #define HALF_ITERATIONS 8 diff --git a/lib/libssl/src/crypto/des/des_ver.h b/lib/libssl/src/crypto/des/des_ver.h index d1ada258a65..b4a6ffdc39e 100644 --- a/lib/libssl/src/crypto/des/des_ver.h +++ b/lib/libssl/src/crypto/des/des_ver.h @@ -58,11 +58,6 @@ #include -#ifdef OPENSSL_BUILD_SHLIBCRYPTO -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - /* The following macros make sure the names are different from libdes names */ #define DES_version OSSL_DES_version #define libdes_version OSSL_libdes_version diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index 71dac84dac2..5100369bab2 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -164,11 +164,6 @@ #include #include -#ifdef OPENSSL_BUILD_SHLIBSSL -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \ l|=(((unsigned long)(*((c)++)))<< 8), \ l|=(((unsigned long)(*((c)++)))<<16), \ diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 71dac84dac2..5100369bab2 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -164,11 +164,6 @@ #include #include -#ifdef OPENSSL_BUILD_SHLIBSSL -# undef OPENSSL_EXTERN -# define OPENSSL_EXTERN OPENSSL_EXPORT -#endif - #define c2l(c,l) (l = ((unsigned long)(*((c)++))) , \ l|=(((unsigned long)(*((c)++)))<< 8), \ l|=(((unsigned long)(*((c)++)))<<16), \ -- 2.20.1