From 0222a38bc8e73c636cb69460de27ee001aa7d501 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 19 Jan 2018 12:07:23 +0000
Subject: [PATCH] mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821625 13f79535-47bb-0310-9956-ffa450edef68
---
 server/Makefile.in   |  3 ++-
 server/mpm_fdqueue.c |  5 +++--
 server/mpm_fdqueue.h | 33 +++++++++++++++++----------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/server/Makefile.in b/server/Makefile.in
index 57422e9f6f..46fbd54d1d 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -9,7 +9,8 @@ LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
 	config.c log.c main.c vhost.c util.c util_fcgi.c \
 	util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
-	connection.c listen.c util_mutex.c mpm_common.c mpm_unix.c \
+	connection.c listen.c util_mutex.c \
+	mpm_common.c mpm_unix.c mpm_fdqueue.c \
 	util_charset.c util_cookies.c util_debug.c util_xml.c \
 	util_filter.c util_pcre.c util_regex.c exports.c \
 	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
diff --git a/server/mpm_fdqueue.c b/server/mpm_fdqueue.c
index 5b0192b2ee..6e843a6ef8 100644
--- a/server/mpm_fdqueue.c
+++ b/server/mpm_fdqueue.c
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "fdqueue.h"
-#include "apr_atomic.h"
+#include "mpm_fdqueue.h"
+
+#include <apr_atomic.h>
 
 static const apr_uint32_t zero_pt = APR_UINT32_MAX/2;
 
diff --git a/server/mpm_fdqueue.h b/server/mpm_fdqueue.h
index df54217387..2c6f9266e1 100644
--- a/server/mpm_fdqueue.h
+++ b/server/mpm_fdqueue.h
@@ -15,30 +15,29 @@
  */
 
 /**
- * @file  event/fdqueue.h
+ * @file  server/mpm_fdqueue.h
  * @brief fd queue declarations
  *
  * @addtogroup APACHE_MPM_EVENT
  * @{
  */
 
-#ifndef FDQUEUE_H
-#define FDQUEUE_H
-#include "httpd.h"
-#include <stdlib.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <apr_thread_mutex.h>
-#include <apr_thread_cond.h>
-#include <sys/types.h>
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#include <apr_errno.h>
+#ifndef MPM_FDQUEUE_H
+#define MPM_FDQUEUE_H
+
+#include <apr.h>
+
+/* Not worth thinking about w/o threads... */
+#if APR_HAS_THREADS
 
 #include "ap_mpm.h"
 
+#include <apr_ring.h>
+#include <apr_pools.h>
+#include <apr_network_io.h>
+#include <apr_thread_mutex.h>
+#include <apr_thread_cond.h>
+
 typedef struct fd_queue_info_t fd_queue_info_t;
 typedef struct event_conn_state_t event_conn_state_t;
 
@@ -104,5 +103,7 @@ apr_status_t ap_queue_interrupt_all(fd_queue_t * queue);
 apr_status_t ap_queue_interrupt_one(fd_queue_t * queue);
 apr_status_t ap_queue_term(fd_queue_t * queue);
 
-#endif /* FDQUEUE_H */
+#endif /* APR_HAS_THREADS */
+
+#endif /* MPM_FDQUEUE_H */
 /** @} */
-- 
2.40.0