regex_t is used by both Apache & mbregex. This little check prevent compile

failure, while php is compiled as dso module & mbstring is enabled.

diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index 5cf10407fa59374d691dca17ba10d856d28f3b29..b236e5d44b5b56166ede4c969ad7f85e1a0a250d 100644 (file)
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -40,6 +40,10 @@
 # include <openssl/ssl.h>
 #endif
 
+#ifdef regex_t
+#undef regex_t
+#endif
+
 #include "httpd.h"
 #include "http_config.h"