cvs: /php4 php.h /php4/sapi/apache mod_php4.c php_apache.c sapi_apache.c
| From: | Sascha Schumann | Date: | Fri, 18 Feb 2000 10:13:16 +0000 |
| Subject: | cvs: /php4 php.h /php4/sapi/apache mod_php4.c php_apache.c sapi_apache.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10436@lists.php.net to get a copy of this message | ||
sas Fri Feb 18 02:13:16 2000 EDT
Modified files:
/php4 php.h
/php4/sapi/apache mod_php4.c php_apache.c sapi_apache.c
Log:
Fix warnings when compiling static Apache module
Index: php4/php.h
diff -u php4/php.h:1.62 php4/php.h:1.63
--- php4/php.h:1.62 Fri Feb 11 07:59:26 2000
+++ php4/php.h Fri Feb 18 02:13:15 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.62 2000/02/11 15:59:26 zeev Exp $ */
+/* $Id: php.h,v 1.63 2000/02/18 10:13:15 sas Exp $ */
#ifndef _PHP_H
#define _PHP_H
@@ -163,7 +163,7 @@
#include "fopen-wrappers.h"
-#if REGEX == 1 || REGEX == 0
+#if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H)
#include "regex/regex_extra.h"
#endif
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.32 php4/sapi/apache/mod_php4.c:1.33
--- php4/sapi/apache/mod_php4.c:1.32 Thu Feb 17 12:25:08 2000
+++ php4/sapi/apache/mod_php4.c Fri Feb 18 02:13:15 2000
@@ -17,9 +17,9 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.32 2000/02/17 20:25:08 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.33 2000/02/18 10:13:15 sas Exp $ */
-#define _PHP_REGEX_H
+#define NO_REGEX_EXTRA_H
#include "zend.h"
#include "php.h"
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.5 php4/sapi/apache/php_apache.c:1.6
--- php4/sapi/apache/php_apache.c:1.5 Thu Feb 17 12:25:08 2000
+++ php4/sapi/apache/php_apache.c Fri Feb 18 02:13:15 2000
@@ -17,9 +17,9 @@
| David Sklar <sklar@student.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.5 2000/02/17 20:25:08 zeev Exp $ */
+/* $Id: php_apache.c,v 1.6 2000/02/18 10:13:15 sas Exp $ */
-#define _PHP_REGEX_H
+#define NO_REGEX_EXTRA_H
#include "php.h"
#include "ext/standard/head.h"
Index: php4/sapi/apache/sapi_apache.c
diff -u php4/sapi/apache/sapi_apache.c:1.10 php4/sapi/apache/sapi_apache.c:1.11
--- php4/sapi/apache/sapi_apache.c:1.10 Thu Feb 17 12:25:08 2000
+++ php4/sapi/apache/sapi_apache.c Fri Feb 18 02:13:15 2000
@@ -19,9 +19,9 @@
| Stig Bakken <ssb@fast.no> |
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.10 2000/02/17 20:25:08 zeev Exp $ */
+/* $Id: sapi_apache.c,v 1.11 2000/02/18 10:13:15 sas Exp $ */
-#define _PHP_REGEX_H
+#define NO_REGEX_EXTRA_H
#include "php.h"