From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Thu, 17 Jul 2008 20:04:06 +0000 (+0000)
Subject: - MFH: Fix ZTS build
X-Git-Tag: php-5.3.0alpha1~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2392861770c5a540f2cd1fe340f62c2789c3d33f;p=php

- MFH: Fix ZTS build
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 18110ca030..213d38b5e3 100644
--- 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 04f408cdd5..ea2de502ee 100644
--- 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);