httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1129878 - in /httpd/httpd/trunk: modules/http/byterange_filter.c server/mpm/winnt/child.c
Date Tue, 31 May 2011 19:37:56 GMT
Author: wrowe
Date: Tue May 31 19:37:56 2011
New Revision: 1129878

URL: http://svn.apache.org/viewvc?rev=1129878&view=rev
Log:
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.


Modified:
    httpd/httpd/trunk/modules/http/byterange_filter.c
    httpd/httpd/trunk/server/mpm/winnt/child.c

Modified: httpd/httpd/trunk/modules/http/byterange_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/byterange_filter.c?rev=1129878&r1=1129877&r2=1129878&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/byterange_filter.c (original)
+++ httpd/httpd/trunk/modules/http/byterange_filter.c Tue May 31 19:37:56 2011
@@ -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);
 

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=1129878&r1=1129877&r2=1129878&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Tue May 31 19:37:56 2011
@@ -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 



Mime
View raw message