From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 31 May 2011 19:37:56 +0000 (+0000)
Subject: This is rather irritating.
X-Git-Tag: 2.3.13~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60b8058931c36c0d925c1c071225b2336d7ab4cb;p=thirdparty%2Fapache%2Fhttpd.git

This is rather irritating.

We override exit() throughout the httpd build in order to intercept and
report our status through the service control manager.

We must include process.h prior to overriding exit().

I seem to remember that this is the reason apr.hw once included
process.h unilaterally, to avoid this conflict over exit.



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

diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index 69f372a94e5..98bf281be9c 100644
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -19,6 +19,11 @@
  */
 
 #include "apr.h"
+
+#if APR_HAVE_PROCESS_H
+#include <process.h>            /* for getpid() on Win32 */
+#endif
+
 #include "apr_strings.h"
 #include "apr_buckets.h"
 #include "apr_lib.h"
@@ -53,9 +58,6 @@
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if APR_HAVE_PROCESS_H
-#include <process.h>            /* for getpid() on Win32 */
-#endif
 
 APLOG_USE_MODULE(http);
 
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 70841371c77..e9ba5b13764 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -16,6 +16,8 @@
 
 #ifdef WIN32
 
+#include "apr.h"
+#include <process.h>
 #include "httpd.h"
 #include "http_main.h"
 #include "http_log.h"
@@ -41,8 +43,6 @@
 #include "apr_buckets.h"
 #include "scoreboard.h"
 
-#include <process.h>
-
 #ifdef __MINGW32__
 #include <mswsock.h>
 #endif