Follow up to r1821526: mpm_unix.h

The fdqueue code is not for WIN32 (per mpm_unix.c), and does not seem to
require all the #includes (system) it claimed (at least in .h).

[Reverted by r1821619]

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

diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index 2aa2d3bbe3753f48e565e31ae4eb2c3b95f8445f..d301da8303868ad7ae4d320b98695d8f79f8583e 100644 (file)
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -27,6 +27,8 @@
 
 #ifndef WIN32
 
+#include "mpm_unix.h"
+
 #include "apr.h"
 #include "apr_thread_proc.h"
 #include "apr_signal.h"
@@ -37,8 +39,8 @@
 #include "apr_optional.h"
 #include "apr_allocator.h"
 #include "apr_atomic.h"
+#include "apr_errno.h"
 
-#include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
@@ -49,8 +51,6 @@
 #include "scoreboard.h"
 #include "util_mutex.h"
 
-#include "mpm_unix.h"
-
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif

diff --git a/server/mpm_unix.h b/server/mpm_unix.h
index df54217387566e826f37dd0f97d1faee6dc70e50..826256ef061271571fc0e3799d3d1d647cfd7080 100644 (file)
--- a/server/mpm_unix.h
+++ b/server/mpm_unix.h
@@ -15,27 +15,22 @@
  */
 
 /**
- * @file  event/fdqueue.h
+ * @file  mpm_unix.h
  * @brief fd queue declarations
  *
- * @addtogroup APACHE_MPM_EVENT
+ * @defgroup APACHE_MPM Multi-Processing Modules
+ * @ingroup  APACHE
  * @{
  */
 
-#ifndef FDQUEUE_H
-#define FDQUEUE_H
+#ifndef MPM_UNIX_H
+#define MPM_UNIX_H
+
+#ifndef WIN32
+
 #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>
 
 #include "ap_mpm.h"
 
@@ -104,5 +99,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 /* WIN32 */
+
+#endif /* MPM_UNIX_H */
 /** @} */