svn commit: r1150559 - /httpd/httpd/trunk/include/util_ldap.h

[rp...@apache.org]

Author: rpluem
Date: Mon Jul 25 07:08:33 2011
New Revision: 1150559

URL: http://svn.apache.org/viewvc?rev=1150559&view=rev
Log:
* Make trunk compile with APR trunk again (without LDAP support of course), by
  ensuring that we only include the include files of the APR / APU LDAP API if
  we use 1.x. Move stuff that depends on it inside the APR_HAS_LDAP block.

Modified:
    httpd/httpd/trunk/include/util_ldap.h

Modified: httpd/httpd/trunk/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_ldap.h?rev=1150559&r1=1150558&r2=1150559&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_ldap.h (original)
+++ httpd/httpd/trunk/include/util_ldap.h Mon Jul 25 07:08:33 2011
@@ -28,14 +28,13 @@
 #include "apr_thread_rwlock.h"
 #include "apr_tables.h"
 #include "apr_time.h"
+#include "apr_version.h"
+#if APR_MAJOR_VERSION < 2
+/* The LDAP API is currently only present in APR 1.x */
 #include "apr_ldap.h"
 #include "apr_ldap_rebind.h"
-
-#if APR_HAS_MICROSOFT_LDAPSDK
-#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
-                ||(s) == LDAP_UNAVAILABLE)
 #else
-#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+#define APR_HAS_LDAP 0
 #endif
 
 #if APR_HAS_SHARED_MEMORY
@@ -46,6 +45,13 @@
 /* this whole thing disappears if LDAP is not enabled */
 #if APR_HAS_LDAP
 
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
+                ||(s) == LDAP_UNAVAILABLE)
+#else
+#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+#endif
+
 /* Apache header files */
 #include "ap_config.h"
 #include "httpd.h"