diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-30 16:29:46 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-30 16:29:46 +0000 |
| commit | b6f18f2d51764df3655cb457de0dfe7e444194ee (patch) | |
| tree | c89bd07dfdc16e79ba70ebdef3cc19bb956a28e4 /lib/libcrypto/asn1 | |
| parent | e4bfa51466862d0f0b79c8fb9724881db6400ba2 (diff) | |
Place ASN_ITEM_{ptr,rptr,ref} and DECLARE_ASN1_ITEM under #ifndef
LIBRESSL_INTERNAL.
Diffstat (limited to 'lib/libcrypto/asn1')
| -rw-r--r-- | lib/libcrypto/asn1/asn1.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h index 001bc144127..e35c865e1f0 100644 --- a/lib/libcrypto/asn1/asn1.h +++ b/lib/libcrypto/asn1/asn1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1.h,v 1.41 2016/12/27 16:51:52 jsing Exp $ */ +/* $OpenBSD: asn1.h,v 1.42 2016/12/30 16:29:45 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -390,10 +390,11 @@ TYPEDEF_D2I2D_OF(void); * */ - /* ASN1_ITEM pointer exported type */ typedef const ASN1_ITEM ASN1_ITEM_EXP; +#ifndef LIBRESSL_INTERNAL + /* Macro to obtain ASN1_ITEM pointer from exported type */ #define ASN1_ITEM_ptr(iptr) (iptr) @@ -405,6 +406,7 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP; #define DECLARE_ASN1_ITEM(name) \ extern const ASN1_ITEM name##_it; +#endif /* !LIBRESSL_INTERNAL */ /* Parameters used by ASN1_STRING_print_ex() */ |