Expand the OPENSSL_{GLOBAL,EXPORT,IMPORT,EXTERN} macros - this rids the

libssl tree from all uses of these defines.

ok miod@

3 files changed, 5 insertions, 7 deletions

diff --git a/src/lib/libcrypto/des/des_ver.h b/src/lib/libcrypto/des/des_ver.h
index b4a6ffdc39..bd056ba23b 100644
--- a/src/lib/libcrypto/des/des_ver.h
+++ b/src/lib/libcrypto/des/des_ver.h
@@ -56,11 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-#include <openssl/e_os2.h>
-
 /* The following macros make sure the names are different from libdes names */
 #define DES_version OSSL_DES_version
 #define libdes_version OSSL_libdes_version
 
-OPENSSL_EXTERN const char OSSL_DES_version[];   /* SSLeay version string */
-OPENSSL_EXTERN const char OSSL_libdes_version[];        /* old libdes version string */
+extern const char OSSL_DES_version[];           /* SSLeay version string */
+extern const char OSSL_libdes_version[];        /* old libdes version string */
diff --git a/src/lib/libcrypto/des/ecb_enc.c b/src/lib/libcrypto/des/ecb_enc.c
index f357333b97..b07916758f 100644
--- a/src/lib/libcrypto/des/ecb_enc.c
+++ b/src/lib/libcrypto/des/ecb_enc.c
@@ -61,8 +61,8 @@
 #include <openssl/opensslv.h>
 #include <openssl/bio.h>
 
-OPENSSL_GLOBAL const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT;
-OPENSSL_GLOBAL const char DES_version[]="DES" OPENSSL_VERSION_PTEXT;
+const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT;
+const char DES_version[]="DES" OPENSSL_VERSION_PTEXT;
 
 const char *DES_options(void)
         {
diff --git a/src/lib/libcrypto/des/spr.h b/src/lib/libcrypto/des/spr.h
index b91936a5a5..98ec61eee7 100644
--- a/src/lib/libcrypto/des/spr.h
+++ b/src/lib/libcrypto/des/spr.h
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-OPENSSL_GLOBAL const DES_LONG DES_SPtrans[8][64]={
+const DES_LONG DES_SPtrans[8][64]={
 {
 /* nibble 0 */
 0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,