From 3cc9e9383b2c6f3deff3463312ee672570ca982d Mon Sep 17 00:00:00 2001 From: Gisle Vanem <gvanem@yahoo.no> Date: Wed, 28 Jan 2015 14:22:11 +0100 Subject: [PATCH] ldap: build with BoringSSL --- lib/ldap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/ldap.c b/lib/ldap.c index 7a6aff1794..cc8d29ab12 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -54,6 +54,15 @@ # endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ #endif +/* These are macros in both <wincrypt.h> (in above <winldap.h>) and typedefs + * in BoringSSL's <openssl/x509.h> + */ +#ifdef HAVE_BORINGSSL +# undef X509_NAME +# undef X509_CERT_PAIR +# undef X509_EXTENSIONS +#endif + #include "urldata.h" #include <curl/curl.h> #include "sendf.h" -- GitLab