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 69f372a94e54f5ea504883a5475db924431ba7ba..98bf281be9c3df913880e3eab0953f41d821e58b 100644 (file)
--- 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 70841371c779b189c368fea72ca4cc45ddbf0eac..e9ba5b13764bd9d0f451c65538f6d97f5fd5c86c 100644 (file)
--- 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