MFH:

	Fixed win32 build.
	Added missing headers needed for wait().
	Removed duplicate signal.h header.

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 08619044f622dda43141265e24b4b3b1b99f0dc7..e8e43c1e2b822410cf61cd942f9ad17101aedca9 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -48,6 +48,12 @@
 #if HAVE_SETLOCALE
 #include <locale.h>
 #endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
 #include "zend.h"
 #include "zend_extensions.h"
 #include "php_ini.h"
@@ -61,10 +67,6 @@
 #include "win32/php_registry.h"
 #endif
 
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
 #ifdef __riscos__
 #include <unixlib/local.h>
 #endif
@@ -275,7 +277,11 @@ static void sapi_cgibin_flush(void *server_context)
 #if PHP_FASTCGI
        if (!FCGX_IsCGI()) {
                FCGX_Request *request = (FCGX_Request *)server_context;
-               if (!parent && (!request || FCGX_FFlush(request->out) == -1)) {
+               if (
+#ifdef PHP_WIN32
+               !parent && 
+#endif
+               (!request || FCGX_FFlush(request->out) == -1)) {
                        php_handle_aborted_connection();
                }
                return;