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

diff --git a/include/util_filter.h b/include/util_filter.h
index 803a4aad4bc77f142b150259cc42184caa6f2341..5914bf2a941c2da43eaab8455e8502dcc4d3f152 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -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

diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c
index 10ddd77e939203b6c46d1c1e42dedacbc2a73390..11ef94e354f111680c0f709bb1299377f0d2bf7c 100644 (file)
--- a/modules/aaa/mod_access.c
+++ b/modules/aaa/mod_access.c
@@ -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
 

diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
index 9cd7c526bd004e872fe429526b668a4906c68b84..564434068905b4d2c59bb83b45784113416876db 100644 (file)
--- a/modules/aaa/mod_auth.c
+++ b/modules/aaa/mod_auth.c
@@ -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"

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index be071da380d644a1de149af8039983ee4c1da346..a22614546f78cad1099eca73ee96cd9dee328001 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -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"

diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
index 4ef2f1aed85efdb362709105b203be78e5ee0fb6..d5466d1af4a199a9a23438652f6886b5252c4ff0 100644 (file)
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -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"
 

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 169be916dc69c00de839a6bbbbed613c9d7cbc9a..7aa02fd587667f0522dfbbccd76943ac39a3415f 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -80,6 +80,11 @@
 **     so that we can keep the connection open.
 */
 
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
@@ -88,7 +93,6 @@
 #include "http_protocol.h"
 #include "http_request.h"
 #include "util_script.h"
-#include "apr_strings.h"
 
 #include "mod_dav.h"
 

diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index 8e9572ed40bed73eb1219bac92070e853da4b6ba..22b1e2282e5b5c356c9187af6c2f7aebdb6d5695 100644 (file)
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -57,6 +57,11 @@
 **  - various utilities, repository-independent
 */
 
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "mod_dav.h"
 
 #include "http_request.h"
@@ -65,8 +70,6 @@
 #include "http_log.h"
 #include "http_protocol.h"
 
-#include "apr_strings.h"
-
 DAV_DECLARE(dav_error*) dav_new_error(apr_pool_t *p, int status, 
                                       int error_id, const char *desc)
 {

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 09acb6d1966f47710c8fe3e6f4283c6e6708eca7..206960ebcf084173bea3e30488c945e3b5d55a65 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -69,6 +69,7 @@
 #include "apr_thread_proc.h"
 #include "apr_hash.h"
 #include "apr_user.h"
+#include "apr_lib.h"
 
 #define CORE_PRIVATE
 

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index dd8ef9ecd47d33341819298a2334c91822bf9c07..f7bdb1060a00ee94d0ad442fe122f93266c6618a 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -64,9 +64,17 @@
  * 
  * Adapted to Apache by rst.
  *
- * Version sort added by Martin Pool <mbp@humbug.org.au>. */
+ * Version sort added by Martin Pool <mbp@humbug.org.au>.
+ */
 
 #include "apr_strings.h"
+#include "apr_fnmatch.h"
+#include "apr_strings.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
@@ -76,14 +84,7 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "util_script.h"
-#include "apr_fnmatch.h"
-#include "apr_strings.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 module AP_MODULE_DECLARE_DATA autoindex_module;
 

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index accca9fadfd999a97b507e5c9e63c44833086089..55b9cbbf361a77fdf8f6f95136c9db68416f319c 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -66,16 +66,13 @@
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_buckets.h"
+#include "apr_lib.h"
 
 #define APR_WANT_STDIO          /* for sscanf */
 #define APR_WANT_STRFUNC
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 
-#if APR_HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
 #define CORE_PRIVATE
 #include "util_filter.h"
 #include "ap_config.h"
@@ -94,7 +91,10 @@
 
 #include "mod_core.h"
 
-#ifdef HAVE_UNISTD_H
+#if APR_HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 1a71bc56f45f89a48cd36ccdde30092d8885d306..14d51d26b45f120cebee2f3c0901f033972d7ecd 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -70,6 +70,9 @@
 #include "apr_file_io.h"
 #include "apr_fnmatch.h"
 
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
@@ -84,7 +87,7 @@
 
 #include "mod_core.h"
 
-#ifdef APR_HAVE_STDARG_H
+#if APR_HAVE_STDARG_H
 #include <stdarg.h>
 #endif
 

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 6b103aae7abb4b49478ea5aaa2acf90bfe4dbab7..3318027a503f9d256dd211859649db10913fa6b6 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -179,24 +179,27 @@
  *
  * --- rst */
 
-#define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b"
-
 #include "apr_strings.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"          /* For REMOTE_NAME */
 #include "http_log.h"
 #include "http_protocol.h"
-#ifdef HAVE_UNISTD_H
+
+#if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
+#define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b"
 
 module AP_MODULE_DECLARE_DATA config_log_module;
 

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index a7915d67b6f08b42fcd2ba0b9988514b8b8059a4..ea31c3398d4a3017fca226ff02e7c275fe616686 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -65,13 +65,16 @@
  */
 
 #include "apr_strings.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 typedef struct {
     const char *real;

diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c
index 1ec4a349fa139094d28cd8bc96fd5d668884c925..2fbade814a0cb22728846713d8ce4828d248c6d5 100644 (file)
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -94,10 +94,11 @@
 
 #include "apr.h"
 #include "apr_strings.h"
+#include "apr_lib.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>              /* for sscanf() */
-#endif
+#define APR_WANT_STDIO          /* for sscanf() */
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #include "ap_config.h"
 #include "httpd.h"
@@ -108,12 +109,7 @@
 #include "http_main.h"
 #include "http_log.h"
 #include "util_script.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 #define IMAP_MAGIC_TYPE "application/x-httpd-imap"
 #define MAXVERTS 100

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 3b4d691b1ddc756a7dd0867ac50efa4c2bc9fb20..c6763bce26e9028364d212ed7178c85de6e671df 100644 (file)
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -66,10 +66,11 @@
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_file_io.h"
+#include "apr_lib.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>              /* for EOF */
-#endif
+#define APR_WANT_STDIO          /* for EOF */
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #include "ap_config.h"
 #include "httpd.h"
@@ -79,12 +80,7 @@
 #include "http_core.h"
 #include "http_log.h"
 #include "util_script.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 #define MAP_FILE_MAGIC_TYPE "application/x-type-map"
 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 2253f90f9dcbfe5119d26747452e279dc3f7c926..5b716c5075cbfd895f75a1589e10c4ff7533ae52 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -88,6 +88,22 @@
 **      www.engelschall.com
 */
 
+#include "apr.h"
+#include "apr_strings.h"
+#include "apr_user.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#define APR_WANT_IOVEC
+#include "apr_want.h"
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
@@ -96,30 +112,11 @@
 #include "http_log.h"
 #include "http_protocol.h"
 #include "mod_rewrite.h"
-#include "apr_strings.h"
-#include "apr_user.h"
 
-#if !defined(OS2) && !defined(WIN32)
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS)
 #include "unixd.h"
 #endif
 
-#ifndef NO_WRITEV
-#ifndef NETWARE
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#endif
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
 /*
 ** +-------------------------------------------------------+
 ** |                                                       |

diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h
index fd70d37873f1a8d75dbc38b2de1dbfe5a821f0ee..cb2b1f4c128c8ae01918f4d2da8150746b4884aa 100644 (file)
--- a/modules/mappers/mod_rewrite.h
+++ b/modules/mappers/mod_rewrite.h
@@ -56,8 +56,8 @@
  * University of Illinois, Urbana-Champaign.
  */
 
-#ifndef _MOD_REWRITE_H
-#define _MOD_REWRITE_H 1
+#ifndef MOD_REWRITE_H
+#define MOD_REWRITE_H 1
 
 /*
 **                       _                            _ _
@@ -92,29 +92,31 @@
 **      www.engelschall.com
 */
 
+#include "apr.h"
+
+#define APR_WANT_STRFUNC
+#define APR_WANT_MEMFUNC
+#include "apr_want.h"
 
     /* Include from the underlaying Unix system ... */
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef APR_HAVE_STDARG_H
+#if APR_HAVE_STDARG_H
 #include <stdarg.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#ifdef HAVE_CTYPE_H
+#if APR_HAVE_CTYPE_H
 #include <ctype.h>
 #endif
-#ifndef NETWARE
+#if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-/* are these needed anymore?  rbb */
-#include <signal.h>
-#include <errno.h>
+
+#include "ap_config.h"
+
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
 
     /* Include from the Apache server ... */
 #define CORE_PRIVATE
@@ -472,6 +474,4 @@ static int compare_lexicography(char *cpNum1, char *cpNum2);
 static char *find_closing_bracket(char *s, int left, int right);
 static char *find_char_in_brackets(char *s, int c, int left, int right);
 
-#endif /* _MOD_REWRITE_H */
-
-/*EOF*/
+#endif /* MOD_REWRITE_H */

diff --git a/server/log.c b/server/log.c
index 9b7fec379838ff44c724e09e9dbc37cad380909a..6d641dd0a3e48b6f8d65b39e2f4cc77beda424d4 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -68,13 +68,18 @@
 #include "apr_strings.h"
 #include "apr_errno.h"
 #include "apr_thread_proc.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STDIO
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
 #if APR_HAVE_STDARG_H
 #include <stdarg.h>
 #endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #define CORE_PRIVATE
 
@@ -85,13 +90,6 @@
 #include "http_log.h"
 #include "http_main.h"
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 typedef struct {
        char    *t_name;
        int     t_val;

diff --git a/server/main.c b/server/main.c
index c695622626ed8b3adaca397c6953503c0b66dee9..19c645ea2dbf4b90076fc89db0ab41a9e730a83f 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -60,10 +60,10 @@
 #include "apr_strings.h"
 #include "apr_getopt.h"
 #include "apr_general.h"
+#include "apr_lib.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
+#define APR_WANT_STDIO
+#include "apr_want.h"
 
 #define CORE_PRIVATE
 #include "ap_config.h"

diff --git a/server/rfc1413.c b/server/rfc1413.c
index 1279465c49c36dc2dca34dfcf15b3f928a19bbbd..0239b26e01d56f810664774a68814c7a8b9c7f5b 100644 (file)
--- a/server/rfc1413.c
+++ b/server/rfc1413.c
@@ -82,17 +82,13 @@
 #include "apr.h"
 #include "apr_network_io.h"
 #include "apr_strings.h"
+#include "apr_lib.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
+#define APR_WANT_STDIO
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #include "ap_config.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 #include "httpd.h"             /* for server_rec, conn_rec, etc. */
 #include "http_log.h"          /* for aplog_error */
 #include "rfc1413.h"

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 009cf28d2cf0a709c961846db9b49fa39d470cbf..972a50ad054e0fa3ef63e93f7e9af3efb9dcb8f3 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -56,8 +56,15 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#include "apr.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
+#include "apr_lib.h"
+
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_log.h"
@@ -67,9 +74,6 @@
 
 #include "mpm.h"
 #include "scoreboard.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 
 AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
 AP_DECLARE_DATA const char *ap_scoreboard_fname=NULL;

diff --git a/server/util.c b/server/util.c
index cdd2892b71468e929a3762f8c1bc807a113ad4b6..012886e2d7ba40944693a92876f7325a0261d669 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -69,21 +69,23 @@
  * #define DEBUG_CFG_LINES  to trace every line read from the config files
  */
 
-#define CORE_PRIVATE
-
 #include "apr.h"
 #include "apr_strings.h"
+#include "apr_lib.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>              /* for EOF */
-#endif
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
+#define APR_WANT_STDIO
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
 #endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
+#if APR_HAVE_NETDB_H
+#include <netdb.h>              /* for gethostbyname() */
 #endif
 
+#define CORE_PRIVATE
+
 #include "ap_config.h"
 #include "apr_base64.h"
 #include "httpd.h"
@@ -93,24 +95,12 @@
 #include "http_config.h"
 #include "util_ebcdic.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
 #ifdef HAVE_GRP_H
 #include <grp.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 /* A bunch of functions in util.c scan strings looking for certain characters.
  * To make that more efficient we encode a lookup table.  The test_char_table

diff --git a/server/util_date.c b/server/util_date.c
index 3967a6c02f5f617bb4e6757b3c98b09edff3d6f3..9a53646d31aad6dd396158244dffc7227b8c6266 100644 (file)
--- a/server/util_date.c
+++ b/server/util_date.c
@@ -67,16 +67,20 @@
  * 
  */
 
+#include "apr.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+
 #define CORE_PRIVATE
 
 #include "ap_config.h"
 #include "util_date.h"
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
 
 /*
  * Compare a string to a mask

diff --git a/server/util_debug.c b/server/util_debug.c
index 0972832cfb72d73fe3ef81b9380e2670b0391dd8..de5f469dbc180c4aff444849d357a07cb529061d 100644 (file)
--- a/server/util_debug.c
+++ b/server/util_debug.c
@@ -56,31 +56,46 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 
 #ifdef AP_DEBUG
 # undef strchr
 
 char *ap_strchr(char *s, int c)
-{ return strchr(s,c); }
+{
+    return strchr(s,c);
+}
 
 const char *ap_strchr_c(const char *s, int c)
-{ return strchr(s,c); }
+{
+    return strchr(s,c);
+}
 
 # undef strrchr
 
 char *ap_strrchr(char *s, int c)
-{ return strrchr(s,c); }
+{
+    return strrchr(s,c);
+}
 
 const char *ap_strrchr_c(const char *s, int c)
-{ return strrchr(s,c); }
+{
+    return strrchr(s,c);
+}
 
 #undef strstr
 
 char *ap_strstr(char *s, char *c)
-{ return strstr(s,c); }
+{
+    return strstr(s,c);
+}
 
 const char *ap_strstr_c(const char *s, const char *c)
-{ return strstr(s,c); }
+{
+    return strstr(s,c);
+}
 
-#endif
+#endif /* AP_DEBUG */

diff --git a/server/util_script.c b/server/util_script.c
index 7ca5869a5beb8bf42bb7cada94dc495a5ff0f9e9..9b4975c487a0403f8d18221a16cc096d9e1454d9 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -56,9 +56,19 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#include "apr.h"
+#include "apr_lib.h"
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 #define CORE_PRIVATE
 #include "ap_config.h"
-#include "apr_strings.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_main.h"
@@ -69,18 +79,6 @@
 #include "util_script.h"
 #include "util_date.h"         /* For parseHTTPdate() */
 #include "util_ebcdic.h"
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 
 #ifdef OS2
 #define INCL_DOS

diff --git a/server/util_xml.c b/server/util_xml.c
index c70e34e29f5dba33c93d3983a8d86fcd8be2bc87..a62230323bd7a87b0e4f46992b906df007f8d703 100644 (file)
--- a/server/util_xml.c
+++ b/server/util_xml.c
@@ -63,9 +63,9 @@
 #include "apr.h"
 #include "apr_strings.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>              /* for fprintf(), sprintf() */
-#endif
+#define APR_WANT_STDIO          /* for fprintf(), sprintf() */
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #include "httpd.h"
 #include "http_protocol.h"

diff --git a/server/vhost.c b/server/vhost.c
index 2cae13abba6e2c85873e957c2294bf043c61dd81..f82c986e18556e81568e7e8034ce0da6a381610b 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -61,6 +61,13 @@
  *     (configuration and run-time)
  */
 
+#include "apr.h"
+#include "apr_strings.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
@@ -69,23 +76,6 @@
 #include "http_vhost.h"
 #include "http_protocol.h"
 #include "http_core.h"
-#include "apr_strings.h"
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 /*
  * After all the definitions there's an explanation of how it's all put