You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/01/05 22:35:53 UTC
svn commit: r124279 - in httpd/httpd/trunk: include modules/aaa modules/ldap
Author: wrowe
Date: Wed Jan 5 13:35:51 2005
New Revision: 124279
URL: http://svn.apache.org/viewcvs?view=rev&rev=124279
Log:
Correct the order of includes to follow httpd conventions, and get
Win32 compiling again.
Modified:
httpd/httpd/trunk/include/util_ldap.h
httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
httpd/httpd/trunk/modules/ldap/util_ldap.c
httpd/httpd/trunk/modules/ldap/util_ldap_cache.c
httpd/httpd/trunk/modules/ldap/util_ldap_cache.h
httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
Modified: httpd/httpd/trunk/include/util_ldap.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/util_ldap.h?view=diff&rev=124279&p1=httpd/httpd/trunk/include/util_ldap.h&r1=124278&p2=httpd/httpd/trunk/include/util_ldap.h&r2=124279
==============================================================================
--- httpd/httpd/trunk/include/util_ldap.h (original)
+++ httpd/httpd/trunk/include/util_ldap.h Wed Jan 5 13:35:51 2005
@@ -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
Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?view=diff&rev=124279&p1=httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c&r1=124278&p2=httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c&r2=124279
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Wed Jan 5 13:35:51 2005
@@ -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 {
Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap.c?view=diff&rev=124279&p1=httpd/httpd/trunk/modules/ldap/util_ldap.c&r1=124278&p2=httpd/httpd/trunk/modules/ldap/util_ldap.c&r2=124279
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Wed Jan 5 13:35:51 2005
@@ -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"
@@ -33,6 +29,8 @@
#include "http_request.h"
#include "util_ldap.h"
#include "util_ldap_cache.h"
+
+#include <apr_strings.h>
#if APR_HAVE_UNISTD_H
#include <unistd.h>
Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap_cache.c?view=diff&rev=124279&p1=httpd/httpd/trunk/modules/ldap/util_ldap_cache.c&r1=124278&p2=httpd/httpd/trunk/modules/ldap/util_ldap_cache.c&r2=124279
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache.c Wed Jan 5 13:35:51 2005
@@ -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
Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap_cache.h?view=diff&rev=124279&p1=httpd/httpd/trunk/modules/ldap/util_ldap_cache.h&r1=124278&p2=httpd/httpd/trunk/modules/ldap/util_ldap_cache.h&r2=124279
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache.h (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache.h Wed Jan 5 13:35:51 2005
@@ -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 */
Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c?view=diff&rev=124279&p1=httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c&r1=124278&p2=httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c&r2=124279
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c Wed Jan 5 13:35:51 2005
@@ -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>