fix the declaration of the register-hooks function in the remaining

MPMs... Ryan fixed prefork.c yesterday

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

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 1f49e7c87be4f368ae8e27d0b378ceccc63e0c56..938d0c881f859dcc1a9b3e99c561b249cc848a7a 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -838,7 +838,7 @@ static void beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
     apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
-static void beos_hooks(void)
+static void beos_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST()
     one_process = 0;

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 6abf8c94bf6f5da1159669c1a5e054c35fe25c51..4b88ea97e8c2c7eec58fcd35b1954680d60f8f58 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1157,7 +1157,7 @@ static void dexter_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp
     apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
-static void dexter_hooks(void)
+static void dexter_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST()
     one_process = 0;

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index b93a03c7118e63d3bfba7024a53756a4259e942a..9cc2e2559ae5a50e3b6fbcc4c04d6e1af2b536a8 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1519,7 +1519,7 @@ static int perchild_pre_connection(conn_rec *c)
     return OK;
 }
 
-static void perchild_hooks(void)
+static void perchild_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST()
     one_process = 0;

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index dc0747ada2f46f2a6c8fc65c73816d9bcc9a67f0..54cc3205a0bec4b6727d5ae2a4a85393b4c1e51c 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -848,7 +848,7 @@ static void mpmt_beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t
     apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
-static void mpmt_beos_hooks(void)
+static void mpmt_beos_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST()
     one_process = 0;

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 2a31c75d2062882beee6b5574b6592977e7104b9..c43d68523f5fb7fe505e9f36698fcba1799a68de 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1191,7 +1191,7 @@ static void mpmt_pthread_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_poo
     apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
-static void mpmt_pthread_hooks(void)
+static void mpmt_pthread_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST()
     one_process = 0;

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index b93a03c7118e63d3bfba7024a53756a4259e942a..9cc2e2559ae5a50e3b6fbcc4c04d6e1af2b536a8 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -1519,7 +1519,7 @@ static int perchild_pre_connection(conn_rec *c)
     return OK;
 }
 
-static void perchild_hooks(void)
+static void perchild_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST()
     one_process = 0;

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 8aaccc84862327f8b96455df6c63e3f2296992ae..a449b895b12080927c548571056a39cb5790cb0b 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -1381,7 +1381,7 @@ static void spmt_os2_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t
     apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
-static void spmt_os2_hooks(void)
+static void spmt_os2_hooks(apr_pool_t *p)
 {
     INIT_SIGLIST();
     /* TODO: set one_process properly */ one_process = 0;

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 96585a7c5c7b12e68c41d6816b64aa596a9e6cf2..2d98a29edc629b9b96686fd7201b6dac66ab9abd 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -2226,7 +2226,7 @@ AP_DECLARE(int) ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s )
     return 0; /* Restart */
 }
 
-static void winnt_hooks(void)
+static void winnt_hooks(apr_pool_t *p)
 {
     ap_hook_pre_config(winnt_pre_config, NULL, NULL, AP_HOOK_MIDDLE);
     ap_hook_post_config(winnt_post_config, NULL, NULL, 0);