always use field names
authorDr. Stephen Henson <steve@openssl.org>
Wed, 6 Apr 2016 17:57:48 +0000 (18:57 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 6 Apr 2016 17:57:48 +0000 (18:57 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
include/openssl/asn1t.h

index 455efff..b680dea 100644 (file)
@@ -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
 };
 
 /*-