Fix warnings when compiling static Apache module

diff --git a/main/php.h b/main/php.h
index ccccc7850904eed9d79c79269b92c99ef3ddf2ba..ff9ddc4e041dc0f8fa1e89ca39b12cf5265c92ef 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -163,7 +163,7 @@ extern char *strerror(int);
 
 #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
 

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 5da755996210470bddae49271d86b8e321c257ba..98d01a29a12954cf0b9fdd892af34d35dc9b0f2c 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -19,7 +19,7 @@
  */
 /* $Id$ */
 
-#define _PHP_REGEX_H
+#define NO_REGEX_EXTRA_H
 
 #include "zend.h"
 #include "php.h"

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index e8dcca727840e535eadab3f114f87ff694799105..9fcbf5c4d12fad562e4dbb0ebe2eef95480a1ffc 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -19,7 +19,7 @@
  */
 /* $Id$ */
 
-#define _PHP_REGEX_H
+#define NO_REGEX_EXTRA_H
 
 #include "php.h"
 #include "ext/standard/head.h"

diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 9866e1a87d6081262b9759c2b3a1e201669e8d78..370f457fe2d19f5321e678354d0f9d6cf671314f 100644 (file)
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -21,7 +21,7 @@
  */
 /* $Id$ */
 
-#define _PHP_REGEX_H
+#define NO_REGEX_EXTRA_H
 
 #include "php.h"