[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  26f2412d9beb1bfc88d0647b7b485aa526744fa8 (commit)
      from  f246f90e6afcc32557cade2dcac9c0c3c7d36098 (commit)


- Log -----------------------------------------------------------------
commit 26f2412d9beb1bfc88d0647b7b485aa526744fa8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Apr 6 18:57:48 2016 +0100

    always use field names
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 include/openssl/asn1t.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 455efff..b680dea 100644
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -512,9 +512,7 @@ struct ASN1_TEMPLATE_st {
     unsigned long flags;        /* Various flags */
     long tag;                   /* tag, not used if no tagging */
     unsigned long offset;       /* Offset of this field in structure */
-# ifndef NO_ASN1_FIELD_NAMES
     const char *field_name;     /* Field name */
-# endif
     ASN1_ITEM_EXP *item;        /* Relevant ASN1_ITEM or ASN1_ADB */
 };
 
@@ -631,9 +629,7 @@ struct ASN1_ITEM_st {
     long tcount;                /* Number of templates if SEQUENCE or CHOICE */
     const void *funcs;          /* functions that handle this type */
     long size;                  /* Structure size (usually) */
-# ifndef NO_ASN1_FIELD_NAMES
     const char *sname;          /* Structure name */
-# endif
 };
 
 /*-