diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-02-10 08:05:17 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-02-10 08:05:17 +0000 |
| commit | b5c2159defa1cc30b5386914331a73ed5e49c874 (patch) | |
| tree | 1c8677731dd6bb482b5316aa3fc87acc9b4dff24 /lib | |
| parent | 1beae8437be2c5266ebccdd6c98437823846c908 (diff) | |
Place the IMPLEMENT_ASN1_.*FUNCTION.* macros under an #ifndef
LIBRESSL_INTERNAL - we do not need them any more.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/asn1t.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/asn1/asn1t.h b/lib/libssl/src/crypto/asn1/asn1t.h index dff0276449f..1d96df81488 100644 --- a/lib/libssl/src/crypto/asn1/asn1t.h +++ b/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) |