svn commit: r391985 - /apr/apr-util/trunk/include/apr_ldap.h.in

[jo...@apache.org]

Author: jorton
Date: Thu Apr  6 06:44:59 2006
New Revision: 391985

URL: http://svn.apache.org/viewcvs?rev=391985&view=rev
Log:
* include/apr_ldap.h.in: For OpenLDAP, before including <ldap.h>,
define LDAP_DEPRECATED to 1 if it is not already defined.  Fixes use
of OpenLDAP 2.3, which by default hides the ldap_init() etc
prototypes, which can have rather catastrophic effects at runtime.
(since the compiler presumes ldap_init() returns int and discards the
top half of the LDAP * pointer value on 64-bit platforms)

Modified:
    apr/apr-util/trunk/include/apr_ldap.h.in

Modified: apr/apr-util/trunk/include/apr_ldap.h.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.h.in?rev=391985&r1=391984&r2=391985&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap.h.in (original)
+++ apr/apr-util/trunk/include/apr_ldap.h.in Thu Apr  6 06:44:59 2006
@@ -59,6 +59,12 @@
 #define APR_HAS_LDAP_SSL 1
 #define APR_HAS_LDAP_URL_PARSE      0
 
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
 
 /*
  * Include the standard LDAP header files.