*) 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

diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 7e569699b7846dd38a0d5b27d4f8593387301635..6667f1ce7fb078ccdf97181a7cb077ec9a8fcda2 100644 (file)
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -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;
 

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 206960ebcf084173bea3e30488c945e3b5d55a65..c4d595855aa03389267846c94e7e5e3d6acb6f20 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -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;

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index e23c7032ec046e6bafb221aa48601f1c970d45be..057aeec0bd3c86827a05d26537f7ac1aa8857d44 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -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;
 

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 8ae35df02cafaa27cab123e56ff14f046760e2c1..9b530953b49ec09934dba50f0810e10fec0f36df 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -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; 
 

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 5f3956b9d76d53a4e44d1090975a1d1b43b99825..6ad101bca52331491c8a0ce9bd2bcf7adaa98a20 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -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)

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index f2ed64957c2bcd8ec9060b45b704f62b5dfc1987..a8d60b9f68164c7a723bb1ff10970b623f61008b 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -63,18 +63,19 @@
  * 
  */
 
-#define MIME_PRIVATE
-
+#include "apr.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"
 #include "http_log.h"
 #include "http_request.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
+
 
 /* XXXX - fix me / EBCDIC
  *        there was a cludge here which would use its

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 3d8b39053e5db696b63bd2fbd513c2cf577ca32c..d433949b5c6861a32cfe77fac1aa52732d6d3138 100644 (file)
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -56,6 +56,13 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#include "apr.h"
+#include "apr_file_io.h"
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #define WANT_BASENAME_MATCH
 
 #include "httpd.h"
@@ -63,12 +70,6 @@
 #include "http_config.h"
 #include "http_request.h"
 #include "http_log.h"
-#include "apr_file_io.h"
-#include "apr_strings.h"
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 /* mod_speling.c - by Alexei Kosut <akosut@organic.com> June, 1996
  *

diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 3cc49f5d87a2a9a769938ea294ceefdc0ca7c35d..d7c7299cf1c06c974fecc94062178223dcc649d4 100644 (file)
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -91,25 +91,29 @@
  * disabled, except those explicitly turned on with the "enabled" keyword.
  */
 
-#if !defined(WIN32) && !defined(OS2) && !defined(BEOS)
-#define HAVE_UNIX_SUEXEC
-#endif
-
 #include "apr_strings.h"
 #include "apr_user.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
+
+#if !defined(WIN32) && !defined(OS2) && !defined(BEOS)
+#define HAVE_UNIX_SUEXEC
+#endif
+
 #ifdef HAVE_UNIX_SUEXEC
 #include "unixd.h"        /* Contains the suexec_identity hook used on Unix */
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 /* The default directory in user's home dir */
 #ifndef DEFAULT_USER_DIR

diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c
index 2b15a3bb4bee190ecb94f17be3ecac83cb80882a..985d6d49a69b9944dfe4485e4e014e3c5f57bbd3 100644 (file)
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -75,16 +75,18 @@
  * both written by James Grinter <jrg@blodwen.demon.co.uk>.
  */
 
+#include "apr.h"
 #include "apr_strings.h"
 #include "apr_hooks.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_request.h"  /* for ap_hook_translate_name */
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 module AP_MODULE_DECLARE_DATA vhost_alias_module;
 

diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c
index 21f7ca42010104d50c30ac74237541c70892a24d..caf276294200cdeb5b3d27d8db1b67c496b0b56a 100644 (file)
--- a/modules/metadata/mod_cern_meta.c
+++ b/modules/metadata/mod_cern_meta.c
@@ -149,20 +149,23 @@
  * 29.Jun.96 All directives made per-directory.
  */
 
+#include "apr.h"
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "util_script.h"
 #include "http_log.h"
 #include "http_request.h"
-#include "apr_strings.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 #define DIR_CMD_PERMS OR_INDEXES
 

diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index 21b8301bd3edf79813261f919ab2658764158f33..3b1907ded2e07de02163f6807b199dd40a49ccbb 100644 (file)
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -99,14 +99,18 @@
  *       *** older versions of the module.                        ***
  */
 
+#include "apr.h"
 #include "apr_strings.h"
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+
 
 typedef struct {
     apr_table_t *vars;

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index b0e72aa53b97555356a13eb086b75a45c2e36476..3c5c972c536fbe2641799f32dc606e3ada4d5baf 100644 (file)
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -193,18 +193,18 @@
  * Hi, welcome to the internet.
  */
 
+#include "apr.h"
+#include "apr_strings.h"
+#include "apr_lib.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "ap_config.h"
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
 #include "http_request.h"
-#include "apr_strings.h"
 
 typedef struct {
     int active;

diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index 9c3c9ea49b39431f98ecb679dae8ca6f4de70080..009d206f2391c51cb5d2c43cda5c956198a93dcf 100644 (file)
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -102,14 +102,16 @@
  *
  */
 
+#include "apr.h"
 #include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 typedef enum {
     hdr_add = 'a',              /* add header (could mean multiple hdrs) */

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 4d1404f704aa9acaee7fdf8767b168970f65a19d..67eb4409e2fdfbc8a7bbc0a8e73113640493b931 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -124,7 +124,13 @@
  *
  */
 
+#include "apr.h"
 #include "apr_strings.h"
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
@@ -133,9 +139,8 @@
 #include "http_log.h"
 #include "http_protocol.h"
 #include "util_script.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+
+/* ### this isn't set by configure? does anybody set this? */
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif

diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 5914db504e04fcb895b7d6e6901ca0f7a46073d8..b09c6ac1485a853c2b81e7b3fbf82f78c96c45d6 100644 (file)
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -115,16 +115,19 @@
  *    SetEnvIf remote_addr (127.0.0.1|192.168.10.) LOCAL
  */
 
+#include "apr.h"
 #include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
 #include "http_protocol.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 enum special {
     SPECIAL_NOT,

diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 31eff29dbebf2a38f30a1c7b8137caee9e9cb653..385cf8a2d114610d42d1a637d4216a6bc74b3f08 100644 (file)
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -63,25 +63,13 @@
  * UUencoding modified by: Alvaro Martinez Echevarria <alvaro@lander.es>
  */
 
+#include "apr_general.h"    /* for XtOffsetOf                */
+
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
 #include "http_protocol.h"  /* for ap_hook_post_read_request */
 
-#include "apr_general.h"    /* for XtOffsetOf                */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 
 typedef struct {
     unsigned int stamp;

diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index 5f3bcf193f14258f3706d435b5f0074c0ed129d5..d9e71975e2586236839df58ab9f09498a227d2ca 100644 (file)
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -100,15 +100,17 @@
  * This file replaces mod_cookies.c
  */
 
+#include "apr.h"
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_request.h"
-#include "apr_strings.h"
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 module AP_MODULE_DECLARE_DATA usertrack_module;
 

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 6588c32b726e2ef02fdb620a6f956a93c85a021d..b1369dd10a4eca65c546f9f7e67b5de9550aba37 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -88,30 +88,28 @@
 #define TESTING        0
 #undef EXPLAIN
 
-#include "httpd.h"
-#include "http_config.h"
-#include "http_protocol.h"
-#include "proxy_cache.h"
-
 #include "apr_compat.h"
 #include "apr_strings.h"
 
-#ifdef HAVE_NETDB_H
+#if APR_HAVE_NETDB_H
 #include <netdb.h>
 #endif
-
-#ifdef HAVE_SYS_SOCKET_H
+#if APR_HAVE_SYS_SOCKET_H
 #include <sys/socket.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
 
+#include "httpd.h"
+#include "http_config.h"
+#include "http_protocol.h"
+#include "proxy_cache.h"
+
+
 extern module AP_MODULE_DECLARE_DATA proxy_module;
 
 

diff --git a/server/config.c b/server/config.c
index 2fe88af9e90d8b6a2160310830da7e80017e6713..5a417fc3998fe3d6a2a251a3c80f9f8ad68d52f6 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -76,9 +76,9 @@
 #include "apr_portable.h"
 #include "apr_file_io.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
+#define APR_WANT_STDIO
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #define CORE_PRIVATE
 
@@ -92,12 +92,7 @@
 #include "http_main.h"
 #include "http_vhost.h"
 #include "util_cfgtree.h"
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
 
 AP_DECLARE_DATA const char *ap_server_argv0;
 

diff --git a/server/config.m4 b/server/config.m4
index 479fbeafffc5d1519ed3437fc404814dfd529c30..66b6ee3b76df6155ad92131d4441c1077cdde55f 100644 (file)
--- a/server/config.m4
+++ b/server/config.m4
@@ -1,7 +1,5 @@
 dnl ## Check for libraries
 
-AC_DEFUN(APACHE_DEFINE_HAVE_CRYPT, [
-])
 AC_CHECK_LIB(nsl, gethostname, [
  AC_ADD_LIBRARY(nsl) ], [])
 
@@ -11,29 +9,13 @@ AC_CHECK_LIB(socket, socket, [
 AC_CHECK_LIB(nsl, gethostbyaddr, [
  AC_ADD_LIBRARY(nsl) ], [])
 
-AC_CHECK_LIB(crypt, crypt, [
- AC_ADD_LIBRARY(crypt) 
-], [
-  AC_CHECK_LIB(ufc, crypt, [
-   AC_ADD_LIBRARY(ufc) 
-  ], [])
-])
 
 dnl ## Check for header files
 
-AC_HEADER_STDC
-AC_CHECK_HEADERS(
-bstring.h \
-crypt.h \
-unistd.h \
-sys/resource.h \
-sys/select.h \
-sys/processor.h \
-)
+AC_CHECK_HEADERS(bstring.h unistd.h)
 
 dnl ## Check for typedefs, structures, and compiler characteristics.
 
-AC_TYPE_RLIM_T
 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 [AC_TRY_COMPILE([#include <sys/types.h>
 #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
@@ -46,9 +28,7 @@ fi
 
 dnl ## Check for library functions
 
-AC_CHECK_FUNCS(
-syslog \
-)
+AC_CHECK_FUNCS(syslog)
 
 dnl Obsolete scoreboard code uses this.
     AC_CHECK_HEADERS(sys/times.h)

diff --git a/server/connection.c b/server/connection.c
index 0a0b380d288d6d3994a902df36adcb92a8ad4fbd..15c74584759f96dfe448208bfc0261307afabcc5 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -56,9 +56,11 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#include "apr.h"
+#include "apr_strings.h"
+
 #define CORE_PRIVATE
 #include "ap_config.h"
-#include "apr_strings.h"
 #include "httpd.h"
 #include "http_connection.h"
 #include "http_request.h"
@@ -71,13 +73,6 @@
 #include "http_log.h"
 #include "util_filter.h"
 
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
 APR_HOOK_STRUCT(
            APR_HOOK_LINK(pre_connection)
            APR_HOOK_LINK(process_connection)

diff --git a/server/listen.c b/server/listen.c
index 3617e08da36909f6a7863db644bc9b869d5cd2c4..46aafe083a4bb1283eaf0ef0cc357fdd6f024ad6 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -57,19 +57,20 @@
  */
 
 #include "apr_network_io.h"
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #define CORE_PRIVATE
 #include "ap_config.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "ap_listen.h"
-#include "apr_strings.h"
 #include "http_log.h"
 #include "mpm.h"
 #include "mpm_common.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
+
 
 ap_listen_rec *ap_listeners;
 #if APR_HAVE_IPV6

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 0211ad46eb408732786e50b7b8e63b4e658cd6ce..1d3885d54820f592cc204cd663437253b8fbc982 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -56,12 +56,21 @@
  * University of Illinois, Urbana-Champaign.
  */
 
-#define CORE_PRIVATE 
- 
+#include "apr.h"
 #include "apr_portable.h"
 #include "apr_strings.h"
 #include "apr_file_io.h"
 #include "apr_thread_proc.h"
+
+#if APR_HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if APR_HAVE_SYS_WAIT_H
+#include <sys/wait.h> 
+#endif
+
+#define CORE_PRIVATE 
+ 
 #include "ap_config.h"
 #include "httpd.h" 
 #include "http_main.h" 
@@ -78,12 +87,7 @@
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h> 
-#endif
+
 #include <pthread.h>
 #include <signal.h>
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 739bc58380be38014e923f860cb087ef7e83e98a..d2d9bba7a6f06aeae8952f2934177cd6a49d9a1f 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -89,14 +89,15 @@
 #include "apr_strings.h"
 #include "apr_thread_proc.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>              /* for perror() */
-#endif
-#if APR_HAVE_SYS_WAIT_H
-#include <sys/wait.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_SYS_TYPES_H
+#include <sys/types.h>
 #endif
 
 #define CORE_PRIVATE
@@ -115,22 +116,10 @@
 #include "mpm_common.h"
 #include "ap_listen.h"
 #include "ap_mmn.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>       /* for TCP_NODELAY */
-#endif
 
 #ifdef HAVE_BSTRING_H
 #include <bstring.h>           /* for IRIX, FD_SET calls bzero() */
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h> 
-#endif
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif

diff --git a/server/util_filter.c b/server/util_filter.c
index 8a21b755a1379823455af22f557430f534b25bfe..c4fef0de5e1c5af27e254ca550517879ef179fae 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -52,14 +52,13 @@
  * <http://www.apache.org/>.
  */
 
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 #include "http_log.h"
 #include "util_filter.h"
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
 /* ### make this visible for direct manipulation?
  * ### use a hash table
  */

diff --git a/server/util_uri.c b/server/util_uri.c
index cf4aa6b22f8faffad6897dcce2c388c22ccb563f..aa360432ce704dfbfc16a9df600af2bffc754af5 100644 (file)
--- a/server/util_uri.c
+++ b/server/util_uri.c
@@ -61,20 +61,16 @@
  * 
  */
 
-#include "ap_config.h"
+#include "apr.h"
 #include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#include "ap_config.h"
 #include "httpd.h"
 #include "http_log.h"
 #include "util_uri.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
 
 /* Some WWW schemes and their default ports; this is basically /etc/services */
 /* This will become global when the protocol abstraction comes */