From: Paul Querna <pquerna@apache.org>
Date: Sat, 20 Sep 2008 22:04:03 +0000 (+0000)
Subject: Add dummy ap_mpm_register_timed_callback for other MPMs besides Event.
X-Git-Tag: 2.3.0~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1457f7207a8d2920b629b25da7f6916c18893134;p=thirdparty%2Fapache%2Fhttpd.git

Add dummy ap_mpm_register_timed_callback for other MPMs besides Event.


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

diff --git a/server/mpm/experimental/event/mpm.h b/server/mpm/experimental/event/mpm.h
index cf4e61d9115..94f87e29adf 100644
--- a/server/mpm/experimental/event/mpm.h
+++ b/server/mpm/experimental/event/mpm.h
@@ -49,6 +49,8 @@
 #define AP_MPM_WANT_FATAL_SIGNAL_HANDLER
 #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
+#define AP_MPM_HAS_USER_CALLBACKS
+
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 #define MPM_ACCEPT_FUNC unixd_accept
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 70942e2e417..3c04350496b 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -1288,3 +1288,15 @@ apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf)
 }
 
 #endif /* AP_MPM_WANT_FATAL_SIGNAL_HANDLER */
+
+#ifndef AP_MPM_HAS_USER_CALLBACKS
+
+AP_DECLARE(void) ap_mpm_register_timed_callback(apr_time_t t,
+                                                ap_mpm_callback_fn_t *cbfn,
+                                                void *baton)
+{
+    abort();
+}
+
+#endif /* AP_MPM_HAS_USER_CALLBACKS */
+