From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 18 Jan 2018 18:05:37 +0000 (+0000)
Subject: Follow up to r1821526: mpm_unix.h needs this includes only for now.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2962
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed1e3421f01b1fc5a956ffc1595dec2624f92fd0;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1821526: mpm_unix.h needs this includes only for now.

[Reverted by r1821619]


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

diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index d301da83038..2fae89bc4c4 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -29,7 +29,6 @@
 
 #include "mpm_unix.h"
 
-#include "apr.h"
 #include "apr_thread_proc.h"
 #include "apr_signal.h"
 #include "apr_strings.h"
@@ -41,12 +40,12 @@
 #include "apr_atomic.h"
 #include "apr_errno.h"
 
+#include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
 #include "http_main.h"
 #include "mpm_common.h"
-#include "ap_mpm.h"
 #include "ap_listen.h"
 #include "scoreboard.h"
 #include "util_mutex.h"
diff --git a/server/mpm_unix.h b/server/mpm_unix.h
index 826256ef061..45e0ab1f869 100644
--- a/server/mpm_unix.h
+++ b/server/mpm_unix.h
@@ -28,7 +28,10 @@
 
 #ifndef WIN32
 
-#include "httpd.h"
+#include <apr.h>
+#include <apr_ring.h>
+#include <apr_pools.h>
+#include <apr_network_io.h>
 #include <apr_thread_mutex.h>
 #include <apr_thread_cond.h>