summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-03-05 16:12:23 +0000
committerfoobar <sniper@php.net>2003-03-05 16:12:23 +0000
commit45964cb629cf329912c605f992a4f30e5e988fe0 (patch)
tree8ca5c69fde2894060dc597b77437c37801b89ebc /sapi/apache2handler
parentd31fa3da61288b4cae26c9581ba9ab737b9c95cb (diff)
downloadphp-git-45964cb629cf329912c605f992a4f30e5e988fe0.tar.gz
- Fix for some unixware compile problem. (comment by Sascha :)
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r--sapi/apache2handler/sapi_apache2.c10
1 files changed, 6 insertions, 4 deletions
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"