Cleanup... most don't need apr_hooks.h at all...

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

diff --git a/include/http_config.h b/include/http_config.h
index 80956c0f1f5da310991261090b6689c5d02871b7..aec29d3e695f8e973402b06b2e8db54f65f6ac21 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -26,7 +26,6 @@
 #ifndef APACHE_HTTP_CONFIG_H
 #define APACHE_HTTP_CONFIG_H
 
-#include "apr_hooks.h"
 #include "util_cfgtree.h"
 #include "ap_config.h"
 

diff --git a/include/http_connection.h b/include/http_connection.h
index 43824dc8c92261f3a8f283c52874824c70a0beda..37437cfd5abd1ad0ad9614aa6267017f7e059a0a 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -26,7 +26,6 @@
 #ifndef APACHE_HTTP_CONNECTION_H
 #define APACHE_HTTP_CONNECTION_H
 
-#include "apr_hooks.h"
 #include "apr_network_io.h"
 #include "apr_buckets.h"
 

diff --git a/include/http_protocol.h b/include/http_protocol.h
index bc00e7bed7baa7a3377a375725d3135adeba73ff..61d33a3949bc8baed582bbc1466574acd63ea59a 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -27,7 +27,6 @@
 #define APACHE_HTTP_PROTOCOL_H
 
 #include "httpd.h"
-#include "apr_hooks.h"
 #include "apr_portable.h"
 #include "apr_mmap.h"
 #include "apr_buckets.h"

diff --git a/include/http_request.h b/include/http_request.h
index 5c607f7f7c01a548bd3de5ff1708c17ea39439cc..43dd7c8c0bf085d48fc412700b4420f94171cd2b 100644 (file)
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -47,7 +47,6 @@
 #ifndef APACHE_HTTP_REQUEST_H
 #define APACHE_HTTP_REQUEST_H
 
-#include "apr_hooks.h"
 #include "apr_optional.h"
 #include "util_filter.h"
 

diff --git a/include/scoreboard.h b/include/scoreboard.h
index c0268e8f41b9afe23c23803659389a6b4d777378..1bf0ad2de47b27b208b9c3cf08c23a3b0613a44c 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -33,7 +33,6 @@ extern "C" {
 
 #include "ap_config.h"
 #include "http_config.h"
-#include "apr_hooks.h"
 #include "apr_thread_proc.h"
 #include "apr_portable.h"
 #include "apr_shm.h"

diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c
index a2bb7a80c98883707adb02d1bfec1b412fa551bf..c35c1fe51e41dde03109d6e82e355271db83d09c 100644 (file)
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -35,7 +35,7 @@
 
 #include "apr.h"
 #include "apr_strings.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "apr_lib.h"
 
 #define APR_WANT_STRFUNC

diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
index 18dc2bdb8838fce03d473452d528f63fb6765974..7e9df5d305a5fd0064a9a7f4de04f92692ebf144 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c
+++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;
 

diff --git a/modules/proxy/balancers/mod_lbmethod_byrequests.c b/modules/proxy/balancers/mod_lbmethod_byrequests.c
index 4a9885d517e24a26e6e1b62f6e12e450cbabd5d0..8c3bafd7114bd5d7ab0dccbea5600d19fdff61aa 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_byrequests.c
+++ b/modules/proxy/balancers/mod_lbmethod_byrequests.c
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;
 

diff --git a/modules/proxy/balancers/mod_lbmethod_bytraffic.c b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
index fc058a6ce65dc8431ee8f4588f7dd03682ea4f33..f915b968ffe0b2a47ee1fe12f7b8b32ba0885f31 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c
+++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;
 

diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index 0987415ac60f043518c6dbf12f406c354fe96708..11d28f41a27d08881c8ab10432fb8bc070b7a948 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "ap_slotmem.h"
 #include "heartbeat.h"
 

diff --git a/modules/proxy/examples/mod_lbmethod_rr.c b/modules/proxy/examples/mod_lbmethod_rr.c
index 7888552ea4e0e26cc6b570464c3933422ebbbc56..7d6c955cdfa01a2534fba4cf8b1528fed411813f 100644 (file)
--- a/modules/proxy/examples/mod_lbmethod_rr.c
+++ b/modules/proxy/examples/mod_lbmethod_rr.c
@@ -25,7 +25,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h> /* for getpid() */

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index c85579aaad8caced910a734616425bd1e6a92087..63efb618af2e919862d9d6c3c300a93d1da8f472 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -20,7 +20,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "apr_date.h"
 
 static const char *balancer_mutex_type = "proxy-balancer-shm";

diff --git a/modules/proxy/mod_proxy_scgi.c b/modules/proxy/mod_proxy_scgi.c
index d99a3ba5eda23d83cbb9c213a3f30c67cc8e0060..8925fa7c4d157d7a8d24f7bcfd020689ad649251 100644 (file)
--- a/modules/proxy/mod_proxy_scgi.c
+++ b/modules/proxy/mod_proxy_scgi.c
@@ -25,7 +25,7 @@
 #define APR_WANT_MEMFUNC
 #define APR_WANT_STRFUNC
 #include "apr_strings.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "apr_optional_hooks.h"
 #include "apr_buckets.h"
 

diff --git a/server/core.c b/server/core.c
index 83bd0954c56fde2a24fea8366c7cf2c72cd9c868..0f4422bc152c5e49062653bae30489435d10ba1b 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -20,7 +20,6 @@
 #include "apr_fnmatch.h"
 #include "apr_hash.h"
 #include "apr_thread_proc.h"    /* for RLIMIT stuff */
-#include "apr_hooks.h"
 
 #define APR_WANT_IOVEC
 #define APR_WANT_STRFUNC

diff --git a/server/core_filters.c b/server/core_filters.c
index ec969fcffe6125605b80e0d43e3ba3eddd1269f5..1a62c79b45643a59fa8c34af9b52a824c6912734 100644 (file)
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -25,7 +25,6 @@
 #include "apr_fnmatch.h"
 #include "apr_hash.h"
 #include "apr_thread_proc.h"    /* for RLIMIT stuff */
-#include "apr_hooks.h"
 
 #define APR_WANT_IOVEC
 #define APR_WANT_STRFUNC

diff --git a/server/util_filter.c b/server/util_filter.c
index 94095a243c7749607f80a278ed5363cdefba8935..41f6639bb628f2b91afa52c46bfc3a8960932c78 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -29,7 +29,7 @@
    so we depend on a global to hold the correct pool
 */
 #define FILTER_POOL     apr_hook_global_pool
-#include "apr_hooks.h"   /* for apr_hook_global_pool */
+#include "ap_hooks.h"   /* for apr_hook_global_pool */
 
 /*
 ** This macro returns true/false if a given filter should be inserted BEFORE