Commit f91eacb9 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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
parent c647d171

include/util_ldap.h

+14 −14
Changes for include/util_ldap.h: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/aaa/mod_authnz_ldap.c

+12 −14
Changes for modules/aaa/mod_authnz_ldap.c: 12 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -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 {

modules/ldap/util_ldap.c

+2 −4
Changes for modules/ldap/util_ldap.c: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/ldap/util_ldap_cache.c

+2 −2
Changes for modules/ldap/util_ldap_cache.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/ldap/util_ldap_cache.h

+1 −4
Changes for modules/ldap/util_ldap_cache.h: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -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 */