moriyoshi Thu Jul 17 20:04:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c php_mbregex.h
Log:
- MFH: Fix ZTS build
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.18&r2=1.224.2.22.2.25.2.19&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.18
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.19
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.18 Thu Jul 17
16:08:37 2008
+++ php-src/ext/mbstring/mbstring.c Thu Jul 17 20:04:05 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.18 2008/07/17 16:08:37 moriyoshi Exp $
*/
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.19 2008/07/17 20:04:05 moriyoshi Exp $
*/
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1008,12 +1008,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.12.2.1.2.1.2.7&r2=1.12.2.1.2.1.2.8&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.h
diff -u php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.7
php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.8
--- php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.7 Thu Jul 17 16:08:37 2008
+++ php-src/ext/mbstring/php_mbregex.h Thu Jul 17 20:04:06 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.7 2008/07/17 16:08:37 moriyoshi Exp $ */
+/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.8 2008/07/17 20:04:06 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
