summaryrefslogtreecommitdiff
path: root/include/util_ldap.h
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-06-04 13:31:49 +0000
committerStefan Fritsch <sf@apache.org>2011-06-04 13:31:49 +0000
commitec64e1a29f3400bf9b61231f2ff5c32e9e0ba956 (patch)
treed936e6aee4345803787271b01530cecbeb5e6337 /include/util_ldap.h
parent02bbc3848ee15a6bbf135a52fa0c376d93fdb015 (diff)
downloadhttpd-ec64e1a29f3400bf9b61231f2ff5c32e9e0ba956.tar.gz
Several fixes for the ap_ldap build logic. This should fix compilation
without --with-ldap. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1131393 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/util_ldap.h')
-rw-r--r--include/util_ldap.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/util_ldap.h b/include/util_ldap.h
index 5ee3fb6043..d5e5b3d1cc 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -28,9 +28,6 @@
#include "apr_thread_rwlock.h"
#include "apr_tables.h"
#include "apr_time.h"
-#include "ap_ldap.h"
-#include "ap_ldap_rebind.h"
-
#if AP_HAS_MICROSOFT_LDAPSDK
#define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \
||(s) == LDAP_UNAVAILABLE)
@@ -43,9 +40,6 @@
#include "apr_shm.h"
#endif
-/* this whole thing disappears if LDAP is not enabled */
-#if AP_HAS_LDAP
-
/* Apache header files */
#include "ap_config.h"
#include "httpd.h"
@@ -56,6 +50,12 @@
#include "http_request.h"
#include "apr_optional.h"
+/* this whole thing disappears if LDAP is not enabled */
+#if AP_HAS_LDAP
+
+#include "ap_ldap.h"
+#include "ap_ldap_rebind.h"
+
#ifdef __cplusplus
extern "C" {
#endif