sniper Wed Mar 5 11:12:41 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache2filter sapi_apache2.c
Log:
MFH
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91.2.5
php4/sapi/apache2filter/sapi_apache2.c:1.91.2.6
--- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.5 Tue Jan 28 11:34:41 2003
+++ php4/sapi/apache2filter/sapi_apache2.c Wed Mar 5 11:12:41 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.5 2003/01/28 16:34:41 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.6 2003/03/05 16:12:41 sniper Exp $ */
#include <fcntl.h>
@@ -46,6 +46,13 @@
#include "ap_mpm.h"
#include "php_apache.h"
+
+/* UnixWare defines shutdown to _shutdown, which causes problems later
+ * on when using a structure member named shutdown. Since this source
+ * file does not use the system call shutdown, it is safe to #undef it.
+ */
+#undef shutdown
+
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
