Unifdef -U OPENSSL_BUILD_SHLIBCRYPTO, since all it causes under Unix is to

redefine OPENSSL_EXTERN from `extern' to `extern'.

diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index 868f9c0..176a3d5 100644 (file)
--- 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 d230e4b..fcb3c5c 100644 (file)
--- 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 122fc14..3eff114 100644 (file)
--- 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 1b0c530..1a21467 100644 (file)
--- 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 d1ada25..b4a6ffd 100644 (file)
--- 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/src/crypto/asn1/asn1.h b/lib/libssl/src/crypto/asn1/asn1.h
index 868f9c0..176a3d5 100644 (file)
--- a/lib/libssl/src/crypto/asn1/asn1.h
+++ b/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/asn1t.h b/lib/libssl/src/crypto/asn1/asn1t.h
index d230e4b..fcb3c5c 100644 (file)
--- a/lib/libssl/src/crypto/asn1/asn1t.h
+++ b/lib/libssl/src/crypto/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/libssl/src/crypto/des/des.h b/lib/libssl/src/crypto/des/des.h
index 122fc14..3eff114 100644 (file)
--- 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 1b0c530..1a21467 100644 (file)
--- a/lib/libssl/src/crypto/des/des_locl.h
+++ b/lib/libssl/src/crypto/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/libssl/src/crypto/des/des_ver.h b/lib/libssl/src/crypto/des/des_ver.h
index d1ada25..b4a6ffd 100644 (file)
--- a/lib/libssl/src/crypto/des/des_ver.h
+++ b/lib/libssl/src/crypto/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/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h
index 71dac84..5100369 100644 (file)
--- a/lib/libssl/src/ssl/ssl_locl.h
+++ b/lib/libssl/src/ssl/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), \

diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index 71dac84..5100369 100644 (file)
--- 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), \