clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ZTS build

Browse Source
This commit is contained in:
Dmitry Stogov 2006-03-27 06:02:42 +00:00
parent 5dc7c284f6
commit bdfa3b1d36
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_exceptions.c
View File

@ -385,6 +385,8 @@ static int _build_trace_args(zval **arg, int num_args, va_list args, zend_hash_k
}
case IS_UNICODE: {
int l_added;
TSRMLS_FETCH();
/*
* We do not want to apply current error mode here, since
* zend_make_printable_zval() uses output encoding converter.

4
Zend/zend_unicode.c
View File

@ -472,7 +472,7 @@ ZEND_API int zval_unicode_to_string(zval *string, UConverter *conv TSRMLS_DC)
/* }}} */
/* {{{ zval_string_to_unicode_ex */
ZEND_API int zval_string_to_unicode_ex(zval *string, UConverter *conv)
ZEND_API int zval_string_to_unicode_ex(zval *string, UConverter *conv TSRMLS_DC)
{
UErrorCode status = U_ZERO_ERROR;
int retval = TRUE;
@ -499,7 +499,7 @@ ZEND_API int zval_string_to_unicode_ex(zval *string, UConverter *conv)
/* {{{ zval_string_to_unicode */
ZEND_API int zval_string_to_unicode(zval *string TSRMLS_DC)
{
return zval_string_to_unicode_ex(string, ZEND_U_CONVERTER(UG(runtime_encoding_conv)));
return zval_string_to_unicode_ex(string, ZEND_U_CONVERTER(UG(runtime_encoding_conv)) TSRMLS_CC);
}
/* }}} */

2
Zend/zend_unicode.h
View File

@ -65,7 +65,7 @@ void zend_update_converters_error_behavior(TSRMLS_D);
ZEND_API int zend_convert_to_unicode(UConverter *conv, UChar **target, int *target_len, const char *source, int source_len, UErrorCode *status);
ZEND_API int zend_convert_from_unicode(UConverter *conv, char **target, int *target_len, const UChar *source, int source_len, UErrorCode *status);
ZEND_API void zend_convert_encodings(UConverter *target_conv, UConverter *source_conv, char **target, int *target_len, const char *source, int source_len, UErrorCode *status);
ZEND_API int zval_string_to_unicode_ex(zval *string, UConverter *conv);
ZEND_API int zval_string_to_unicode_ex(zval *string, UConverter *conv TSRMLS_DC);
ZEND_API int zval_string_to_unicode(zval *string TSRMLS_DC);
ZEND_API int zval_unicode_to_string(zval *string, UConverter *conv TSRMLS_DC);

10
ext/standard/string.c
View File

@ -3513,7 +3513,7 @@ PHPAPI char *php_strtr(char *str, int len, char *str_from, char *str_to, int trl
/* {{{ php_u_strtr
*/
PHPAPI UChar *php_u_strtr(UChar *str, int len, UChar *str_from, int str_from_len, UChar *str_to, int str_to_len, int trlen, int *outlen)
PHPAPI UChar *php_u_strtr(UChar *str, int len, UChar *str_from, int str_from_len, UChar *str_to, int str_to_len, int trlen, int *outlen TSRMLS_DC)
{
int i, j;
int can_optimize = 1;
@ -3580,7 +3580,7 @@ PHPAPI UChar *php_u_strtr(UChar *str, int len, UChar *str_from, int str_from_len
zend_u_hash_add(tmp_hash, IS_UNICODE, ZSTR("a"), 2, &tmp, sizeof(zval *), NULL);
/* Run the replacement */
str = php_u_strtr_array(str, len, tmp_hash, minlen, maxlen, outlen TSRMLS_DC);
str = php_u_strtr_array(str, len, tmp_hash, minlen, maxlen, outlen TSRMLS_CC);
zend_hash_destroy(tmp_hash);
efree(tmp_hash);
@ -3589,7 +3589,7 @@ PHPAPI UChar *php_u_strtr(UChar *str, int len, UChar *str_from, int str_from_len
}
/* }}} */
static HashTable* php_u_strtr_array_prepare_hashtable(HashTable *hash, int *minlen_out, int *maxlen_out)
static HashTable* php_u_strtr_array_prepare_hashtable(HashTable *hash, int *minlen_out, int *maxlen_out TSRMLS_DC)
{
HashTable *tmp_hash = emalloc(sizeof(HashTable));
HashPosition hpos;
@ -3851,7 +3851,7 @@ PHP_FUNCTION(strtr)
int minlen, maxlen;
HashTable *hash;
hash = php_u_strtr_array_prepare_hashtable(HASH_OF(*from), &minlen, &maxlen);
hash = php_u_strtr_array_prepare_hashtable(HASH_OF(*from), &minlen, &maxlen TSRMLS_CC);
outstr = php_u_strtr_array(Z_USTRVAL_PP(str), Z_USTRLEN_PP(str), hash, minlen, maxlen, &outlen TSRMLS_CC);
zend_hash_destroy(hash);
efree(hash);
@ -3868,7 +3868,7 @@ PHP_FUNCTION(strtr)
Z_USTRVAL_PP(to),
Z_USTRLEN_PP(to),
MIN(Z_USTRLEN_PP(from), Z_USTRLEN_PP(to)),
&outlen);
&outlen TSRMLS_CC);
ZVAL_UNICODEL(return_value, outstr, outlen, 0);
Z_TYPE_P(return_value) = IS_UNICODE;