From: Sascha Schumann <sas@php.net>
Date: Fri, 18 Feb 2000 10:13:15 +0000 (+0000)
Subject: Fix warnings when compiling static Apache module
X-Git-Tag: php-4.0b4_rc1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02d647b5f9b71dc8be2b9c6bdc87c4850c07683b;p=php

Fix warnings when compiling static Apache module
---

diff --git a/main/php.h b/main/php.h
index ccccc78509..ff9ddc4e04 100644
--- 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 5da7559962..98d01a29a1 100644
--- 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 e8dcca7278..9fcbf5c4d1 100644
--- 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 9866e1a87d..370f457fe2 100644
--- 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"