MFH

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 394709e51dac532d4756ed5b3fce00f09f91e59c..13038dbce1ef4d61c7edaea4b1e3ce27c2aeb3b9 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -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;