Commit 03f5d112 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent eb9f3300

modules/http/byterange_filter.c

+5 −3
Changes for modules/http/byterange_filter.c: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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);

server/mpm/winnt/child.c

+2 −2
Changes for server/mpm/winnt/child.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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