aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@yahoo.no>2015-01-28 14:22:11 +0100
committerDaniel Stenberg <daniel@haxx.se>2015-01-28 14:22:11 +0100
commit3cc9e9383b2c6f3deff3463312ee672570ca982d (patch)
tree60b798bb259d0967720b56e969c351609052fa8d /lib
parent9d964e5477c50d0c702f27e8297d242a81cec304 (diff)
ldap: build with BoringSSL
Diffstat (limited to 'lib')
-rw-r--r--lib/ldap.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ldap.c b/lib/ldap.c
index 7a6aff179..cc8d29ab1 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"