Correct the order of includes to follow httpd conventions, and get

  Win32 compiling again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124279 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/util_ldap.h b/include/util_ldap.h
index fd6f44f3ea50744c0cf19c3bac104e425cacb934..f036d3b0a856fa1c23e12bccacc43a839b530d7d 100644 (file)
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -16,17 +16,22 @@
 #ifndef UTIL_LDAP_H
 #define UTIL_LDAP_H
 
-#include <apr_ldap.h>
+/* APR header files */
+#include "apr.h"
+#include "apr_thread_mutex.h"
+#include "apr_thread_rwlock.h"
+#include "apr_tables.h"
+#include "apr_time.h"
+#include "apr_ldap.h"
+
+#if APR_HAS_SHARED_MEMORY
+#include "apr_rmm.h"
+#include "apr_shm.h"
+#endif
 
 /* this whole thing disappears if LDAP is not enabled */
 #if APR_HAS_LDAP
 
-/* APR header files */
-#include <apr_thread_mutex.h>
-#include <apr_thread_rwlock.h>
-#include <apr_tables.h>
-#include <apr_time.h>
-
 /* Apache header files */
 #include "ap_config.h"
 #include "httpd.h"
@@ -36,13 +41,8 @@
 #include "http_protocol.h"
 #include "http_request.h"
 
-#if APR_HAS_SHARED_MEMORY
-#include "apr_rmm.h"
-#include "apr_shm.h"
-#endif
-
-/* Create a set of LDAP_DECLARE(type), LDLDAP_DECLARE(type) and 
- * LDAP_DECLARE_DATA with appropriate export and import tags for the platform
+/* Create a set of LDAP_DECLARE macros with appropriate export 
+ * and import tags for the platform
  */
 #if !defined(WIN32)
 #define LDAP_DECLARE(type)            type

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 20d108e99cf7bd7248fe4ecd7ac382b5694ee012..32642d240adb399c95bb024bfcd83bf5f33cc2da 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -13,19 +13,6 @@
  * limitations under the License.
  */
 
-#include "apr_ldap.h"
-#include "apr_strings.h"
-#include "apr_xlate.h"
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-
-#include "ap_config.h"
-#if APR_HAVE_UNISTD_H
-/* for getpid() */
-#include <unistd.h>
-#endif
-#include <ctype.h>
-
 #include "ap_provider.h"
 #include "httpd.h"
 #include "http_config.h"
@@ -37,8 +24,19 @@
 
 #include "mod_auth.h"
 
+#include "apr_strings.h"
+#include "apr_xlate.h"
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_UNISTD_H
+/* for getpid() */
+#include <unistd.h>
+#endif
+#include <ctype.h>
+
 #if !APR_HAS_LDAP
-#error mod_auth_ldap requires APR-util to have LDAP support built in. To fix add --with-ldap to ./configure.
+#error mod_authnz_ldap requires APR-util to have LDAP support built in. To fix add --with-ldap to ./configure.
 #endif
 
 typedef struct {

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 0d917321e52c236ed47f98d3d4e0c5f2f9b86977..89864f7ca003d0b28b8cfb402e09bdf90b887877 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -21,10 +21,6 @@
  * Copyright 1999-2001 Dave Carrigan
  */
 
-#include <apr_ldap.h>
-#include <apr_strings.h>
-
-#include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
@@ -34,6 +30,8 @@
 #include "util_ldap.h"
 #include "util_ldap_cache.h"
 
+#include <apr_strings.h>
+
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/modules/ldap/util_ldap_cache.c b/modules/ldap/util_ldap_cache.c
index 6be03b32316425322de48b35c3269a9103552732..0d2692b6c72d3bf817ae1ead65c8935b7700da16 100644 (file)
--- a/modules/ldap/util_ldap_cache.c
+++ b/modules/ldap/util_ldap_cache.c
@@ -21,10 +21,10 @@
  * Copyright 1999-2001 Dave Carrigan
  */
 
-#include <apr_ldap.h>
-#include <apr_strings.h>
+#include "httpd.h"
 #include "util_ldap.h"
 #include "util_ldap_cache.h"
+#include <apr_strings.h>
 
 #if APR_HAS_LDAP
 

diff --git a/modules/ldap/util_ldap_cache.h b/modules/ldap/util_ldap_cache.h
index 4fc9f3463ee9376b2d7cf89eb539b2cfc8b1ae0d..9c08901850913ef611765b660cbcf2fb50ee7861 100644 (file)
--- a/modules/ldap/util_ldap_cache.h
+++ b/modules/ldap/util_ldap_cache.h
@@ -28,10 +28,7 @@
  * LDAP Cache Manager
  */
 
-#if APR_HAS_SHARED_MEMORY
-#include <apr_shm.h>
-#include <apr_rmm.h> /* EDD */
-#endif
+#include "util_ldap.h"
 
 typedef struct util_cache_node_t {
     void *payload;             /* Pointer to the payload */

diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c
index ab35ad35da11a1ee17c668e1279c1183bd84eddc..69523a8d2feb193403b6cb8ce15405e8fb8d3b5b 100644 (file)
--- a/modules/ldap/util_ldap_cache_mgr.c
+++ b/modules/ldap/util_ldap_cache_mgr.c
@@ -21,7 +21,7 @@
  * Copyright 1999-2001 Dave Carrigan
  */
 
-#include <apr_ldap.h>
+#include "httpd.h"
 #include "util_ldap.h"
 #include "util_ldap_cache.h"
 #include <apr_strings.h>