Protect us from Apache 2.0's pcre-posix stuff

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index c418c1f57683823b8e7db9bc49f61b811f8e4baf..c1d1e0c232ac2f44c543d9c675d15e5f8d49b780 100644 (file)
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -17,6 +17,9 @@
 #include "regex/regex_extra.h"
 #undef PHP_NO_ALIASES
 
+#undef _PCREPOSIX_H
+#define _PCREPOSIX_H 1
+
 #ifndef _REGEX_H
 #define _REGEX_H 1                             /* this should stop Apache from loading the system version of regex.h */
 #endif

diff --git a/main/php_regex.h b/main/php_regex.h
index c418c1f57683823b8e7db9bc49f61b811f8e4baf..c1d1e0c232ac2f44c543d9c675d15e5f8d49b780 100644 (file)
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -17,6 +17,9 @@
 #include "regex/regex_extra.h"
 #undef PHP_NO_ALIASES
 
+#undef _PCREPOSIX_H
+#define _PCREPOSIX_H 1
+
 #ifndef _REGEX_H
 #define _REGEX_H 1                             /* this should stop Apache from loading the system version of regex.h */
 #endif