- MFH: Fix ZTS build

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 18110ca030650700c512081ca9454f50f7876d17..213d38b5e3f1caa55d4da3bef7953f1ffcf2ddeb 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1008,12 +1008,12 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 #if HAVE_MBREGEX
                {
                        const char *enc_name = new_value;
-                       if (FAILURE == php_mb_regex_set_default_mbctype(enc_name)) {
+                       if (FAILURE == php_mb_regex_set_default_mbctype(enc_name TSRMLS_CC)) {
                                /* falls back to EUC-JP if an unknown encoding name is given */
                                enc_name = "EUC-JP";
-                               php_mb_regex_set_default_mbctype(enc_name);
+                               php_mb_regex_set_default_mbctype(enc_name TSRMLS_CC);
                        }
-                       php_mb_regex_set_mbctype(new_value);
+                       php_mb_regex_set_mbctype(new_value TSRMLS_CC);
                }
 #endif
 #ifdef ZEND_MULTIBYTE

diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h
index 04f408cdd564e06523cabb2bea1b42a428e9a1b5..ea2de502ee22f0c65e4e117f38d603787ea22908 100644 (file)
--- a/ext/mbstring/php_mbregex.h
+++ b/ext/mbstring/php_mbregex.h
@@ -69,7 +69,7 @@ PHP_MINFO_FUNCTION(mb_regex);
 
 typedef struct _zend_mb_regex_globals zend_mb_regex_globals;
 
-zend_mb_regex_globals *php_mb_regex_globals_new(TSRMLS_D);
+zend_mb_regex_globals *php_mb_regex_globals_alloc(TSRMLS_D);
 void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals TSRMLS_DC);
 int php_mb_regex_set_mbctype(const char *enc TSRMLS_DC);
 int php_mb_regex_set_default_mbctype(const char *encname TSRMLS_DC);