From: foobar <sniper@php.net>
Date: Wed, 5 Mar 2003 16:12:23 +0000 (+0000)
Subject: - Fix for some unixware compile problem. (comment by Sascha :)
X-Git-Tag: RELEASE_0_5~601
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45964cb629cf329912c605f992a4f30e5e988fe0;p=php

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

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 792b01b734..d1b64057dd 100644
--- 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 9918271aa4..e7e1bbdda9 100644
--- 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"