diff options
| author | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2007-08-13 13:03:08 +0000 |
|---|---|---|
| committer | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2007-08-13 13:03:08 +0000 |
| commit | 22c61d8da637d19aef219ee910147b3f547d3fe9 (patch) | |
| tree | 4367e1013dc328a3cf2d0b8130a5dbab060d0e98 | |
| parent | 1b88990cbb84daa657d2eb62407bf1f9f24e6c69 (diff) | |
Simplify and rename internal structure to avoid potential name clash with LDAP header file.
| -rw-r--r-- | lib/ldap.c | 13 |
1 files changed, 7 insertions, 6 deletions
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 |