diff options
| author | Jeff Trawick <trawick@apache.org> | 2013-12-01 19:51:04 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2013-12-01 19:51:04 +0100 |
| commit | 58f5ac2464c12978378f0f71d910113ed434313e (patch) | |
| tree | 9968840a481eebf54dccc56c4182fcdd9cce9c27 /server/mpm_common.c | |
| parent | Follow-up to r1546759: Fix compilation when exception hooks aren't enabled. (diff) | |
| download | apache2-58f5ac2464c12978378f0f71d910113ed434313e.tar.xz apache2-58f5ac2464c12978378f0f71d910113ed434313e.zip | |
avoid duplication of APR_HOOK_LINK invocations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546836 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm_common.c')
| -rw-r--r-- | server/mpm_common.c | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/server/mpm_common.c b/server/mpm_common.c index 07e3d31e89..5d0f36a757 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -62,38 +62,30 @@ #undef APLOG_MODULE_INDEX #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX +#define DEFAULT_HOOK_LINKS \ + APR_HOOK_LINK(monitor) \ + APR_HOOK_LINK(drop_privileges) \ + APR_HOOK_LINK(mpm) \ + APR_HOOK_LINK(mpm_query) \ + APR_HOOK_LINK(mpm_register_timed_callback) \ + APR_HOOK_LINK(mpm_register_socket_callback) \ + APR_HOOK_LINK(mpm_unregister_socket_callback) \ + APR_HOOK_LINK(mpm_get_name) \ + APR_HOOK_LINK(end_generation) \ + APR_HOOK_LINK(child_status) \ + APR_HOOK_LINK(suspend_connection) \ + APR_HOOK_LINK(resume_connection) + #if AP_ENABLE_EXCEPTION_HOOK APR_HOOK_STRUCT( APR_HOOK_LINK(fatal_exception) - APR_HOOK_LINK(monitor) - APR_HOOK_LINK(drop_privileges) - APR_HOOK_LINK(mpm) - APR_HOOK_LINK(mpm_query) - APR_HOOK_LINK(mpm_register_timed_callback) - APR_HOOK_LINK(mpm_register_socket_callback) - APR_HOOK_LINK(mpm_unregister_socket_callback) - APR_HOOK_LINK(mpm_get_name) - APR_HOOK_LINK(end_generation) - APR_HOOK_LINK(child_status) - APR_HOOK_LINK(suspend_connection) - APR_HOOK_LINK(resume_connection) + DEFAULT_HOOK_LINKS ) AP_IMPLEMENT_HOOK_RUN_ALL(int, fatal_exception, (ap_exception_info_t *ei), (ei), OK, DECLINED) #else APR_HOOK_STRUCT( - APR_HOOK_LINK(monitor) - APR_HOOK_LINK(drop_privileges) - APR_HOOK_LINK(mpm) - APR_HOOK_LINK(mpm_query) - APR_HOOK_LINK(mpm_register_timed_callback) - APR_HOOK_LINK(mpm_register_socket_callback) - APR_HOOK_LINK(mpm_unregister_socket_callback) - APR_HOOK_LINK(mpm_get_name) - APR_HOOK_LINK(end_generation) - APR_HOOK_LINK(child_status) - APR_HOOK_LINK(suspend_connection) - APR_HOOK_LINK(resume_connection) + DEFAULT_HOOK_LINKS ) #endif AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor, |