diff options
| author | Yang Tse <yangsita@gmail.com> | 2010-06-04 15:14:31 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2010-06-04 15:14:31 +0200 |
| commit | 43d20d81a55a0e30becea04b7e607775093ce6eb (patch) | |
| tree | 4bff0680c51839d1d494befaa2e66230021b2ae4 /lib/ldap.c | |
| parent | bc0f3dd15e99db189ae38c04ac660a174b7c27ec (diff) | |
Enable OpenLDAP support for cygwin builds.
Enable OpenLDAP support for cygwin builds. This support was disabled back
in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers.
cygwin's OpenSSL 0.9.8l and OpenLDAP 2.3.43 versions on cygwin 1.5.25
allow building an OpenLDAP enabled libcurl supporting back to Windows 95.
Remove non-functional CURL_LDAP_HYBRID code and references.
Diffstat (limited to 'lib/ldap.c')
| -rw-r--r-- | lib/ldap.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/lib/ldap.c b/lib/ldap.c index e837dbfdd..d6556c905 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -43,15 +43,7 @@ #include <ctype.h> #include <errno.h> -#ifdef CURL_LDAP_HYBRID /* If W$ definitions are needed. */ -# include <windows.h> - /* Remember we are NOT in a W$ compiler! */ -# undef WIN32 -# undef _WIN32 -# undef __WIN32__ -#endif - -#ifdef CURL_LDAP_WIN /* Use W$ LDAP implementation. */ +#ifdef CURL_LDAP_WIN /* Use Windows LDAP implementation. */ # include <winldap.h> # ifndef LDAP_VENDOR_NAME # error Your Platform SDK is NOT sufficient for LDAP support! Update your Platform SDK, or disable LDAP support! @@ -59,14 +51,14 @@ # include <winber.h> # endif #else -#define LDAP_DEPRECATED 1 /* Be sure ldap_init() is defined. */ -#ifdef HAVE_LBER_H -# include <lber.h> -#endif +# define LDAP_DEPRECATED 1 /* Be sure ldap_init() is defined. */ +# ifdef HAVE_LBER_H +# include <lber.h> +# endif # include <ldap.h> -#if (defined(HAVE_LDAP_SSL) && defined(HAVE_LDAP_SSL_H)) -# include <ldap_ssl.h> -#endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ +# if (defined(HAVE_LDAP_SSL) && defined(HAVE_LDAP_SSL_H)) +# include <ldap_ssl.h> +# endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ #endif #ifdef HAVE_UNISTD_H |