cvs: php4 / main.c
| From: | Thies C. Arntzen | Date: | Fri, 19 May 2000 10:48:05 +0000 |
| Subject: | cvs: php4 / main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15235@lists.php.net to get a copy of this message | ||
thies Fri May 19 12:48:05 2000 EDT
Modified files:
/php4 main.c
Log:
fix the fix (it's still a hack)
Index: php4/main.c
diff -u php4/main.c:1.247 php4/main.c:1.248
--- php4/main.c:1.247 Fri May 19 12:40:34 2000
+++ php4/main.c Fri May 19 12:48:05 2000
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.247 2000/05/19 10:40:34 thies Exp $ */
+/* $Id: main.c,v 1.248 2000/05/19 10:48:05 thies Exp $ */
#include <stdio.h>
@@ -59,6 +59,11 @@
#include <syslog.h>
#endif
+#if PHP_SIGCHILD
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif
+
#include "zend_compile.h"
#include "zend_execute.h"
#include "zend_highlight.h"
@@ -638,7 +643,7 @@
#if PHP_SIGCHILD
-static int sigchld_handler(int apar)
+static void sigchld_handler(int apar)
{
while (waitpid(-1, NULL, WNOHANG) > 0)
;