Latest update.

include/openssl/x509.h

@@ -78,24 +78,32 @@ typedef struct X509_sig_st X509_SIG;
 
 typedef struct X509_name_entry_st X509_NAME_ENTRY;
 
-DEFINE_OR_DECLARE_STACK_OF(X509_NAME_ENTRY)
-DEFINE_OR_DECLARE_STACK_OF(X509_NAME)
-DEFINE_OR_DECLARE_STACK_OF(X509)
-DEFINE_OR_DECLARE_STACK_OF(X509_REVOKED)
-DEFINE_OR_DECLARE_STACK_OF(X509_CRL)
+DEFINE_STACK_OF(X509_NAME_ENTRY)
+
+DEFINE_STACK_OF(X509_NAME)
 
 # define X509_EX_V_NETSCAPE_HACK         0x8000
 # define X509_EX_V_INIT                  0x0001
 typedef struct X509_extension_st X509_EXTENSION;
-DEFINE_OR_DECLARE_STACK_OF(X509_EXTENSION)
+
 typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
+
+DEFINE_STACK_OF(X509_EXTENSION)
+
 typedef struct x509_attributes_st X509_ATTRIBUTE;
-DEFINE_OR_DECLARE_STACK_OF(X509_ATTRIBUTE)
+
+DEFINE_STACK_OF(X509_ATTRIBUTE)
+
 typedef struct X509_req_info_st X509_REQ_INFO;
+
 typedef struct X509_req_st X509_REQ;
+
 typedef struct x509_cert_aux_st X509_CERT_AUX;
+
 typedef struct x509_cinf_st X509_CINF;
 
+DEFINE_STACK_OF(X509)
+
 /* This is used for a table of trust checking functions */
 
 typedef struct x509_trust_st {
@@ -106,8 +114,8 @@ typedef struct x509_trust_st {
     int arg1;
     void *arg2;
 } X509_TRUST;
-DEFINE_OR_DECLARE_STACK_OF(X509_TRUST)
 
+DEFINE_STACK_OF(X509_TRUST)
 
 /* standard trust ids */
 
@@ -219,8 +227,12 @@ DEFINE_OR_DECLARE_STACK_OF(X509_TRUST)
                         XN_FLAG_FN_LN | \
                         XN_FLAG_FN_ALIGN)
 
+DEFINE_STACK_OF(X509_REVOKED)
+
 typedef struct X509_crl_info_st X509_CRL_INFO;
 
+DEFINE_STACK_OF(X509_CRL)
+
 typedef struct private_key_st {
     int version;
     /* The PKCS#8 data types */
@@ -244,7 +256,8 @@ typedef struct X509_info_st {
     int enc_len;
     char *enc_data;
 } X509_INFO;
-DEFINE_OR_DECLARE_STACK_OF(X509_INFO)
+
+DEFINE_STACK_OF(X509_INFO)
 
 /*
  * The next 2 structures and their 8 routines are used to manipulate Netscape's