From: Jim Jagielski <jim@apache.org>
Date: Mon, 9 May 2011 15:36:32 +0000 (+0000)
Subject: Cleanup... most don't need apr_hooks.h at all...
X-Git-Tag: 2.3.12~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aef21903cd8b2a3d07d5447b75aad29160e0333;p=thirdparty%2Fapache%2Fhttpd.git

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 80956c0f1f5..aec29d3e695 100644
--- 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 43824dc8c92..37437cfd5ab 100644
--- 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 bc00e7bed7b..61d33a3949b 100644
--- 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 5c607f7f7c0..43dd7c8c0bf 100644
--- 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 c0268e8f41b..1bf0ad2de47 100644
--- 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 a2bb7a80c98..c35c1fe51e4 100644
--- 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 18dc2bdb883..7e9df5d305a 100644
--- 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 4a9885d517e..8c3bafd7114 100644
--- 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 fc058a6ce65..f915b968ffe 100644
--- 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 0987415ac60..11d28f41a27 100644
--- 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 7888552ea4e..7d6c955cdfa 100644
--- 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 c85579aaad8..63efb618af2 100644
--- 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 d99a3ba5eda..8925fa7c4d1 100644
--- 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 83bd0954c56..0f4422bc152 100644
--- 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 ec969fcffe6..1a62c79b456 100644
--- 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 94095a243c7..41f6639bb62 100644
--- 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