Avoid Apache's regex.h, if system regex was chosen

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index 62279c4c08db29f5622a913a688bbdf1fa01bf9d..be0f445af70372ed83668b675563e351ae846de3 100644 (file)
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -1,6 +1,13 @@
 #ifndef _PHP_REGEX_H
 #define _PHP_REGEX_H
 
+/*
+ * REGEX means:
+ * 0.. system regex
+ * 1.. bundled regex
+ * 2.. Apache's regex
+ */
+
 #if REGEX == 1
 /* get aliases */
 #include "regex/regex_extra.h"
@@ -28,6 +35,9 @@
 #endif
 #elif REGEX == 0
 #include <regex.h>
+#ifndef _REGEX_H_
+#define _REGEX_H_ 1
+#endif
 #endif
 
 #endif /* _PHP_REGEX_H */

diff --git a/main/php_regex.h b/main/php_regex.h
index 62279c4c08db29f5622a913a688bbdf1fa01bf9d..be0f445af70372ed83668b675563e351ae846de3 100644 (file)
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -1,6 +1,13 @@
 #ifndef _PHP_REGEX_H
 #define _PHP_REGEX_H
 
+/*
+ * REGEX means:
+ * 0.. system regex
+ * 1.. bundled regex
+ * 2.. Apache's regex
+ */
+
 #if REGEX == 1
 /* get aliases */
 #include "regex/regex_extra.h"
@@ -28,6 +35,9 @@
 #endif
 #elif REGEX == 0
 #include <regex.h>
+#ifndef _REGEX_H_
+#define _REGEX_H_ 1
+#endif
 #endif
 
 #endif /* _PHP_REGEX_H */