From d2c1aaa79508ee1ef726e81f750ddee7f8427547 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 30 Dec 2016 16:29:45 +0000 Subject: Place ASN_ITEM_{ptr,rptr,ref} and DECLARE_ASN1_ITEM under #ifndef LIBRESSL_INTERNAL. --- src/lib/libcrypto/asn1/asn1.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index 001bc14412..e35c865e1f 100644 --- a/src/lib/libcrypto/asn1/asn1.h +++ b/src/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() */ -- cgit v1.2.3-55-g6feb