cvs: php4 /sapi/apache mod_php4.c
| From: | Sascha Schumann | Date: | Fri, 29 Sep 2000 19:08:17 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1879@lists.php.net to get a copy of this message | ||
sas Fri Sep 29 12:08:17 2000 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
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.
PR: #6008, #6362
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.68 php4/sapi/apache/mod_php4.c:1.69
--- php4/sapi/apache/mod_php4.c:1.68 Tue Sep 26 03:58:56 2000
+++ php4/sapi/apache/mod_php4.c Fri Sep 29 12:08:17 2000
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.68 2000/09/26 10:58:56 sas Exp $ */
+/* $Id: mod_php4.c,v 1.69 2000/09/29 19:08:17 sas Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -62,6 +62,8 @@
#if HAVE_MOD_DAV
# include "mod_dav.h"
#endif
+
+#undef shutdown
int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC);
void php_save_umask(void);