- Fix for some unixware compile problem. (comment by Sascha :)

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 792b01b7348f09ce97ac6b9e825be6c7e034203b..d1b64057dd239c3a1a730194a280c70e0fc3d2d5 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -52,10 +52,12 @@
 #include "ap_mpm.h"
 
 #include "php_apache.h"
- 
-#ifdef NETWARE
-#undef shutdown /* To avoid Winsock confusion */
-#endif
+
+/* UnixWare and Netware define 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;

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 9918271aa485937ed995c4e03130b3111feecac7..e7e1bbdda9c5563b8f27091887cbca829e82341d 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -50,11 +50,13 @@
 #include "ap_mpm.h"
 
 #include "php_apache.h"
- 
-#ifdef NETWARE
-#undef shutdown /* To avoid Winsock confusion */
-#endif
 
+/* UnixWare and Netware define 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
+ 
 #define PHP_MAGIC_TYPE "application/x-httpd-php"
 #define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source"
 #define PHP_SCRIPT "php-script"