From 6411419e3be11551c026699bf2afb5e17fdd57c4 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 21 Jan 2017 04:53:22 +0000
Subject: Place {DECLARE,IMPLEMENT}_OBJ_BSEARCH{_GLOBAL,}_CMP_FN macros undef
 LIBRESSL_INTERNAL.

---
 src/lib/libcrypto/objects/objects.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index a4ce4ec220..c40991b5e3 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/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);
-- 
cgit v1.2.3-55-g6feb