From 274940d7438af7ef92ce3e11d75620db94675932 Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gisle.vanem@gmail.com>
Date: Fri, 8 Jun 2018 15:10:05 +0200
Subject: boringssl + schannel: undef X509_NAME in lib/schannel.h

Fixes the build problem when both boringssl and schannel are enabled.

Fixes #2634
Closes #2643
---
 lib/ldap.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'lib/ldap.c')

diff --git a/lib/ldap.c b/lib/ldap.c
index 89047bcbd..4d8f4fa28 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -54,15 +54,6 @@
 # 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"
-- 
cgit v1.2.3