Commit 6afd185e authored by Greg Stein's avatar Greg Stein
Browse files

Clean up some of the includes: 

- explicitly include apr_lib.h since ap_config.h doesn't
- use apr_want.h where possible
- use APR_HAVE_ where possible
- remove some unneeded includes


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

include/util_filter.h

+8 −7
Original line number Diff line number Diff line
@@ -55,17 +55,18 @@ 
#ifndef AP_FILTER_H

#define AP_FILTER_H



#ifdef __cplusplus

extern "C" {

#endif

#include "apr.h"

#include "apr_buckets.h"



#include "httpd.h"



#ifdef APR_HAVE_STDARG_H

#if APR_HAVE_STDARG_H

#include <stdarg.h>

#endif



#include "httpd.h"

#include "apr.h"

#include "apr_buckets.h"

#ifdef __cplusplus

extern "C" {

#endif



/**

 * @package Apache filter library

modules/aaa/mod_access.c

+8 −9
Original line number Diff line number Diff line
@@ -65,23 +65,22 @@ 


#include "apr_strings.h"

#include "apr_network_io.h"

#include "apr_lib.h"



#define APR_WANT_STRFUNC

#include "apr_want.h"



#include "ap_config.h"

#include "httpd.h"

#include "http_core.h"

#include "http_config.h"

#include "http_log.h"

#include "http_request.h"

#ifdef HAVE_STRING_H

#include <string.h>

#endif

#ifdef HAVE_STRINGS_H

#include <strings.h>

#endif

#ifdef HAVE_NETINET_IN_H



#if APR_HAVE_NETINET_IN_H

#include <netinet/in.h>

#endif



#ifdef HAVE_ARPA_INET_H

#if APR_HAVE_ARPA_INET_H

#include <arpa/inet.h>

#endif

modules/aaa/mod_auth.c

+3 −1
Original line number Diff line number Diff line
@@ -70,9 +70,11 @@ 
 *         no control is passed along.

 */



#include "ap_config.h"

#include "apr_strings.h"

#include "apr_md5.h"

#include "apr_lib.h"



#include "ap_config.h"

#include "httpd.h"

#include "http_config.h"

#include "http_core.h"

modules/aaa/mod_auth_digest.c

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ 
#endif

#include "httpd.h"

#include "http_config.h"

#include "http_conf_globals.h"

#include "http_core.h"

#include "http_request.h"

#include "http_log.h"

modules/dav/fs/lock.c

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ 
#include "apr_file_io.h"

#include "apr_uuid.h"



#define APR_WANT_MEMFUNC

#include "apr_want.h"



#include "httpd.h"

#include "http_log.h"