From 6147cf79cb9a00a2d12b54100ee049dfb7920375 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 10 Feb 2015 08:05:16 +0000
Subject: Place the IMPLEMENT_ASN1_.*FUNCTION.* macros under an #ifndef
 LIBRESSL_INTERNAL - we do not need them any more.

---
 src/lib/libcrypto/asn1/asn1t.h         | 5 ++++-
 src/lib/libssl/src/crypto/asn1/asn1t.h | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib/libcrypto/asn1/asn1t.h b/src/lib/libcrypto/asn1/asn1t.h
index dff0276449..1d96df8148 100644
--- a/src/lib/libcrypto/asn1/asn1t.h
+++ b/src/lib/libcrypto/asn1/asn1t.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1t.h,v 1.9 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: asn1t.h,v 1.10 2015/02/10 08:05:16 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -766,6 +766,7 @@ typedef struct ASN1_STREAM_ARG_st {
 		#sname \
 	ASN1_ITEM_end(sname)
 
+#ifndef LIBRESSL_INTERNAL
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 
 #define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
@@ -858,6 +859,8 @@ typedef struct ASN1_STREAM_ARG_st {
 	IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
 	IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
 
+#endif /* !LIBRESSL_INTERNAL */
+
 /* external definitions for primitive types */
 
 DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
diff --git a/src/lib/libssl/src/crypto/asn1/asn1t.h b/src/lib/libssl/src/crypto/asn1/asn1t.h
index dff0276449..1d96df8148 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1t.h
+++ b/src/lib/libssl/src/crypto/asn1/asn1t.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1t.h,v 1.9 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: asn1t.h,v 1.10 2015/02/10 08:05:16 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -766,6 +766,7 @@ typedef struct ASN1_STREAM_ARG_st {
 		#sname \
 	ASN1_ITEM_end(sname)
 
+#ifndef LIBRESSL_INTERNAL
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 
 #define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
@@ -858,6 +859,8 @@ typedef struct ASN1_STREAM_ARG_st {
 	IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
 	IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
 
+#endif /* !LIBRESSL_INTERNAL */
+
 /* external definitions for primitive types */
 
 DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
-- 
cgit v1.2.3-55-g6feb