cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

moriyoshi Thu Jul 17 20:03:50 2008 UTC Modified files: /php-src/ext/mbstring mbstring.c php_mbregex.h Log: - Fix ZTS build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.285&r2=1.286&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.285 php-src/ext/mbstring/mbstring.c:1.286 --- php-src/ext/mbstring/mbstring.c:1.285 Thu Jul 17 16:08:08 2008 +++ php-src/ext/mbstring/mbstring.c Thu Jul 17 20:03:50 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.285 2008/07/17 16:08:08 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.286 2008/07/17 20:03:50 moriyoshi Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -1013,12 +1013,12 @@ #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 http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.h?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/mbstring/php_mbregex.h diff -u php-src/ext/mbstring/php_mbregex.h:1.18 php-src/ext/mbstring/php_mbregex.h:1.19 --- php-src/ext/mbstring/php_mbregex.h:1.18 Thu Jul 17 16:08:08 2008 +++ php-src/ext/mbstring/php_mbregex.h Thu Jul 17 20:03:50 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.h,v 1.18 2008/07/17 16:08:08 moriyoshi Exp $ */ +/* $Id: php_mbregex.h,v 1.19 2008/07/17 20:03:50 moriyoshi Exp $ */ #ifndef _PHP_MBREGEX_H #define _PHP_MBREGEX_H @@ -69,7 +69,7 @@ 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);