Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.

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

diff --git a/server/mpm/event/config3.m4 b/server/mpm/event/config3.m4
index e15f23531448a5d2d5e7f1f828c2ca6e82d012a5..b4dc5e38bc928ffd20455820f37b5df783bd5789 100644 (file)
--- a/server/mpm/event/config3.m4
+++ b/server/mpm/event/config3.m4
@@ -8,7 +8,7 @@ if test "$ac_cv_serf" = yes ; then
 fi
 APACHE_SUBST(MOD_MPM_EVENT_LDADD)
 
-APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo fdqueue.lo,[
+APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo,[
     AC_CHECK_FUNCS(pthread_kill)
 ], , [\$(MOD_MPM_EVENT_LDADD)])
 

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 5ac3e1b5e557d45b9857ee23cadce4970f83ecd2..617668e2f9a36dbcf036e1f1d27c9e1617d33167 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -91,7 +91,7 @@
 #include "mpm_common.h"
 #include "ap_listen.h"
 #include "scoreboard.h"
-#include "fdqueue.h"
+#include "mpm_fdqueue.h"
 #include "mpm_default.h"
 #include "http_vhost.h"
 #include "unixd.h"

diff --git a/server/mpm/event/fdqueue.c b/server/mpm_fdqueue.c
similarity index 100%
rename from server/mpm/event/fdqueue.c
rename to server/mpm_fdqueue.c

diff --git a/server/mpm/event/fdqueue.h b/server/mpm_fdqueue.h
similarity index 100%
rename from server/mpm/event/fdqueue.h
rename to server/mpm_fdqueue.h