Commit 1a80c8fe authored by Greg Stein's avatar Greg Stein
Browse files

*) continued header revamping 

*) torch some headers (and some libs) from the autoconf stuff


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

modules/cache/mod_file_cache.c

+8 −9
Original line number Diff line number Diff line
@@ -109,15 +109,16 @@ 
    an extra stat() that's a waste.

*/



#ifdef HAVE_STDIOP_H

#include <stdio.h>

#endif

#ifdef HAVE_SYS_TYPES_H

#include "apr.h"

#include "apr_mmap.h"

#include "apr_strings.h"



#define APR_WANT_STRFUNC

#include "apr_want.h"



#if APR_HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_STRING_H

#include <string.h>

#endif



#define CORE_PRIVATE
@@ -127,8 +128,6 @@ 
#include "http_protocol.h"

#include "http_request.h"

#include "http_core.h"

#include "apr_mmap.h"

#include "apr_strings.h"



module AP_MODULE_DECLARE_DATA file_cache_module;

modules/filters/mod_include.c

+4 −7
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ 
#include "apr_hash.h"

#include "apr_user.h"

#include "apr_lib.h"

#include "apr_optional.h"



#define APR_WANT_STRFUNC

#include "apr_want.h"



#define CORE_PRIVATE
@@ -84,14 +88,7 @@ 
#include "http_main.h"

#include "util_script.h"

#include "http_core.h"

#include "apr_optional.h"

#include "mod_include.h"

#ifdef HAVE_STRING_H

#include <string.h>

#endif

#ifdef HAVE_STRINGS_H

#include <strings.h>

#endif

#include "util_ebcdic.h"



module AP_MODULE_DECLARE_DATA includes_module;

modules/generators/mod_cgi.c

+6 −8
Original line number Diff line number Diff line
@@ -72,10 +72,14 @@ 
#include "apr.h"

#include "apr_strings.h"

#include "apr_thread_proc.h"    /* for RLIMIT stuff */

#include "apr_optional.h"

#include "apr_buckets.h"



#define APR_WANT_STRFUNC

#include "apr_want.h"



#define CORE_PRIVATE



#include "apr_buckets.h"

#include "util_filter.h"

#include "ap_config.h"

#include "httpd.h"
@@ -87,14 +91,8 @@ 
#include "http_log.h"

#include "util_script.h"

#include "ap_mpm.h"

#include "apr_optional.h"

#include "../filters/mod_include.h"

#ifdef HAVE_STRING_H

#include <string.h>

#endif

#ifdef HAVE_STRINGS_H

#include <strings.h>

#endif





module AP_MODULE_DECLARE_DATA cgi_module;

modules/generators/mod_cgid.c

+20 −15
Original line number Diff line number Diff line
@@ -69,16 +69,29 @@ 
 * they fail. 

 */ 







#define CORE_PRIVATE 



#include "apr_lib.h"

#include "apr_strings.h"

#include "apr_general.h"

#include "apr_file_io.h"

#include "apr_portable.h"

#include "apr_buckets.h"

#include "apr_optional.h"



#define APR_WANT_STRFUNC

#include "apr_want.h"



#if APR_HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif

#if APR_HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif



#define CORE_PRIVATE 



#include "util_filter.h"

#include "httpd.h" 

#include "http_config.h"
@@ -91,20 +104,12 @@ 
#include "ap_mpm.h"

#include "unixd.h"

#include "mod_suexec.h"

#include "apr_optional.h"

#include "../filters/mod_include.h"



/* ### should be tossed in favor of APR */

#include <sys/stat.h>

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

#ifdef HAVE_STRINGS_H

#include <strings.h>

#endif

#include <sys/un.h> /* for sockaddr_un */

#include <sys/types.h>





module AP_MODULE_DECLARE_DATA cgid_module;

modules/http/http_core.c

+0 −7
Original line number Diff line number Diff line
@@ -87,13 +87,6 @@ 


#include "mod_core.h"



#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_ARPA_INET_H

#include <arpa/inet.h>

#endif





/* LimitXMLRequestBody handling */

#define AP_LIMIT_UNSET                  ((long) -1)