diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-01-21 04:53:23 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-01-21 04:53:23 +0000 |
| commit | e089eeed1f688e252d5ecc7956ba4772309235c9 (patch) | |
| tree | 6e53e9f3ee5818b7780979d7c1cb75d2a54714d6 /lib/libcrypto | |
| parent | 229ea9f1a2951f6cd3388862ebee518c1b53d76d (diff) | |
Place {DECLARE,IMPLEMENT}_OBJ_BSEARCH{_GLOBAL,}_CMP_FN macros undef
LIBRESSL_INTERNAL.
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/objects/objects.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libcrypto/objects/objects.h b/lib/libcrypto/objects/objects.h index a4ce4ec2202..c40991b5e34 100644 --- a/lib/libcrypto/objects/objects.h +++ b/lib/libcrypto/objects/objects.h @@ -1,4 +1,4 @@ -/* $OpenBSD: objects.h,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: objects.h,v 1.12 2017/01/21 04:53:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1016,6 +1016,8 @@ const void * OBJ_bsearch_ex_(const void *key, const void *base, int num, int size, int (*cmp)(const void *, const void *), int flags); +#ifndef LIBRESSL_INTERNAL + #define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm) \ static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \ static int nm##_cmp(type1 const *, type2 const *); \ @@ -1095,6 +1097,8 @@ const void * OBJ_bsearch_ex_(const void *key, const void *base, int num, (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \ cmp##_BSEARCH_CMP_FN)),flags) +#endif /* !LIBRESSL_INTERNAL */ + int OBJ_new_nid(int num); int OBJ_add_object(const ASN1_OBJECT *obj); int OBJ_create(const char *oid, const char *sn, const char *ln); |