iliaa Wed Sep 17 01:42:09 2003 EDT
Modified files:
/php-src/sapi/apache php_apache_http.h
Log:
regex_t is used by both Apache & mbregex. This little check prevent compile
failure, while php is compiled as dso module & mbstring is enabled.
Index: php-src/sapi/apache/php_apache_http.h
diff -u php-src/sapi/apache/php_apache_http.h:1.10
php-src/sapi/apache/php_apache_http.h:1.11
--- php-src/sapi/apache/php_apache_http.h:1.10 Fri Jun 27 12:41:41 2003
+++ php-src/sapi/apache/php_apache_http.h Wed Sep 17 01:42:08 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache_http.h,v 1.10 2003/06/27 16:41:41 sniper Exp $ */
+/* $Id: php_apache_http.h,v 1.11 2003/09/17 05:42:08 iliaa Exp $ */
#define NO_REGEX_EXTRA_H
@@ -38,6 +38,10 @@
/* zlib typedefs free_func which causes problems if the SSL includes happen
* after zlib.h is included */
# include <openssl/ssl.h>
+#endif
+
+#ifdef regex_t
+#undef regex_t
#endif
#include "httpd.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
