From: Patrick Monnerat <Patrick.Monnerat@datasphere.ch>
Date: Mon, 13 Aug 2007 13:03:08 +0000 (+0000)
Subject: Simplify and rename internal structure to avoid potential name clash with LDAP header... 
X-Git-Tag: curl-7_17_0~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22c61d8da637d19aef219ee910147b3f547d3fe9;p=curl

Simplify and rename internal structure to avoid potential name clash with LDAP header file.
---

diff --git a/lib/ldap.c b/lib/ldap.c
index 5908e11b6..dbd2e2466 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -74,9 +74,7 @@
 
 /* Use our own implementation. */
 
-typedef struct ldap_url_desc {
-    struct ldap_url_desc *lud_next;
-    char   *lud_scheme;
+typedef struct {
     char   *lud_host;
     int     lud_port;
     char   *lud_dn;
@@ -84,14 +82,17 @@ typedef struct ldap_url_desc {
     int     lud_scope;
     char   *lud_filter;
     char  **lud_exts;
-    int     lud_crit_exts;
-} LDAPURLDesc;
+} CURL_LDAPURLDesc;
+
+#undef LDAPURLDesc
+#define LDAPURLDesc             CURL_LDAPURLDesc
 
 static int  _ldap_url_parse (const struct connectdata *conn,
                              LDAPURLDesc **ludp);
 static void _ldap_free_urldesc (LDAPURLDesc *ludp);
 
-static void (*ldap_free_urldesc)(LDAPURLDesc *) = _ldap_free_urldesc;
+#undef ldap_free_urldesc
+#define ldap_free_urldesc       _ldap_free_urldesc
 #endif
 
 #ifndef LDAP_SIZELIMIT_EXCEEDED