[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  05e97f1d4f940c765e5c93771fe20820acca4438 (commit)
      from  fae11ec714ac8e71d95e824d7102ab5b2ec2e256 (commit)


- Log -----------------------------------------------------------------
commit 05e97f1d4f940c765e5c93771fe20820acca4438
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Sep 16 21:53:58 2015 +0200

    Fix build on mingw
    
    When OPENSSL_EXPORT_VAR_AS_FUNCTION is defined, the static_ASN1_ITEM_start
    macro doesn't exist so the build fails. This problem was introduced in
    commit df2ee0e.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/asn1t.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 6467e4a..4a4e1ef 100644
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -102,6 +102,9 @@ extern "C" {
         { \
                 static const ASN1_ITEM local_it = {
 
+#  define static_ASN1_ITEM_start(itname) \
+        ASN1_ITEM_start(itname)
+
 #  define ASN1_ITEM_end(itname) \
                 }; \
         return &local_it; \