Expand OPENSSL_{GLOBAL,EXTERN} macros that I missed last time around,

since they are hiding in the #define forest.

ok miod@

diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index f92816b..e7264cc 100644 (file)
--- a/lib/libcrypto/asn1/asn1.h
+++ b/lib/libcrypto/asn1/asn1.h
@@ -398,7 +398,7 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP;
 #define ASN1_ITEM_rptr(ref) (&(ref##_it))
 
 #define DECLARE_ASN1_ITEM(name) \
-       OPENSSL_EXTERN const ASN1_ITEM name##_it;
+       extern const ASN1_ITEM name##_it;
 
 #else
 

diff --git a/lib/libcrypto/asn1/asn1t.h b/lib/libcrypto/asn1/asn1t.h
index fcb3c5c..21d41bc 100644 (file)
--- a/lib/libcrypto/asn1/asn1t.h
+++ b/lib/libcrypto/asn1/asn1t.h
@@ -78,7 +78,7 @@ extern "C" {
 /* Macros for start and end of ASN1_ITEM definition */
 
 #define ASN1_ITEM_start(itname) \
-       OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
+       const ASN1_ITEM itname##_it = {
 
 #define ASN1_ITEM_end(itname) \
                };

diff --git a/lib/libssl/src/crypto/asn1/asn1.h b/lib/libssl/src/crypto/asn1/asn1.h
index f92816b..e7264cc 100644 (file)
--- a/lib/libssl/src/crypto/asn1/asn1.h
+++ b/lib/libssl/src/crypto/asn1/asn1.h
@@ -398,7 +398,7 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP;
 #define ASN1_ITEM_rptr(ref) (&(ref##_it))
 
 #define DECLARE_ASN1_ITEM(name) \
-       OPENSSL_EXTERN const ASN1_ITEM name##_it;
+       extern const ASN1_ITEM name##_it;
 
 #else
 

diff --git a/lib/libssl/src/crypto/asn1/asn1t.h b/lib/libssl/src/crypto/asn1/asn1t.h
index fcb3c5c..21d41bc 100644 (file)
--- a/lib/libssl/src/crypto/asn1/asn1t.h
+++ b/lib/libssl/src/crypto/asn1/asn1t.h
@@ -78,7 +78,7 @@ extern "C" {
 /* Macros for start and end of ASN1_ITEM definition */
 
 #define ASN1_ITEM_start(itname) \
-       OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
+       const ASN1_ITEM itname##_it = {
 
 #define ASN1_ITEM_end(itname) \
                };