diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-04-27 20:22:33 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-04-27 20:22:33 +0000 |
| commit | 546506bde9313f0bcf9d76dd6d4abfaa0be1cecd (patch) | |
| tree | 20035c6b99689f42d5751b0adf07766b9a15a882 /lib | |
| parent | 2fbfabbba41f3a2f0ca59b1c7c963e1be07b5145 (diff) | |
Unifdef -U OPENSSL_BUILD_SHLIBCRYPTO, since all it causes under Unix is to
redefine OPENSSL_EXTERN from `extern' to `extern'.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/asn1/asn1.h | 5 | ||||
| -rw-r--r-- | lib/libcrypto/asn1/asn1t.h | 5 | ||||
| -rw-r--r-- | lib/libcrypto/des/des.h | 4 | ||||
| -rw-r--r-- | lib/libcrypto/des/des_locl.h | 12 | ||||
| -rw-r--r-- | lib/libcrypto/des/des_ver.h | 5 | ||||
| -rw-r--r-- | lib/libssl/ssl_locl.h | 5 |
6 files changed, 1 insertions, 35 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 <openssl/bn.h> #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 <openssl/e_os2.h> #include <openssl/asn1.h> -#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 <openssl/e_os2.h> - #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include <math.h> #include <openssl/des.h> - -#if defined(__STDC__) -#include <string.h> -#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 <openssl/e_os2.h> -#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/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 <openssl/err.h> #include <openssl/ssl.h> -#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), \ |