From: Jeff Trawick Date: Thu, 18 Jan 2001 14:02:55 +0000 (+0000) Subject: fix the declaration of the register-hooks function in the remaining X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~187 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a58cc780ad622e838bf83d972f5ac01071adce7b;p=apache 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 1f49e7c87b..938d0c881f 100644 --- 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 6abf8c94bf..4b88ea97e8 100644 --- 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 b93a03c711..9cc2e2559a 100644 --- 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 dc0747ada2..54cc3205a0 100644 --- 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 2a31c75d20..c43d68523f 100644 --- 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 b93a03c711..9cc2e2559a 100644 --- 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 8aaccc8486..a449b895b1 100644 --- 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 96585a7c5c..2d98a29edc 100644 --- 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);