sniper Wed Mar 5 11:12:23 2003 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
/php4/sapi/apache2handler sapi_apache2.c
Log:
- Fix for some unixware compile problem. (comment by Sascha :)
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.105
php4/sapi/apache2filter/sapi_apache2.c:1.106
--- php4/sapi/apache2filter/sapi_apache2.c:1.105 Mon Feb 24 10:10:36 2003
+++ php4/sapi/apache2filter/sapi_apache2.c Wed Mar 5 11:12:23 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.105 2003/02/24 15:10:36 zeev Exp $ */
+/* $Id: sapi_apache2.c,v 1.106 2003/03/05 16:12:23 sniper Exp $ */
#include <fcntl.h>
@@ -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;
Index: php4/sapi/apache2handler/sapi_apache2.c
diff -u php4/sapi/apache2handler/sapi_apache2.c:1.3
php4/sapi/apache2handler/sapi_apache2.c:1.4
--- php4/sapi/apache2handler/sapi_apache2.c:1.3 Fri Feb 21 23:42:34 2003
+++ php4/sapi/apache2handler/sapi_apache2.c Wed Mar 5 11:12:23 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.3 2003/02/22 04:42:34 jerenkrantz Exp $ */
+/* $Id: sapi_apache2.c,v 1.4 2003/03/05 16:12:23 sniper Exp $ */
#include <fcntl.h>
@@ -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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
