Fixed ZTS build

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index a070ee296fc0f9a382f40f9df6e36706bdf61a8d..8a3c059e3f6a17e0385e1f6d04ea74cd721af2d0 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -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.

diff --git a/Zend/zend_unicode.c b/Zend/zend_unicode.c
index 753681c051f33ad6302d4210dc7e7cb922bace5d..99af389b80c61d823e5cc09e154a2452d7160533 100644 (file)
--- a/Zend/zend_unicode.c
+++ b/Zend/zend_unicode.c
@@ -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);
 }
 /* }}} */
 

diff --git a/Zend/zend_unicode.h b/Zend/zend_unicode.h
index 273eb84d82e17e85206e9c7f96fa27a28da4ec90..9c88a560acd7b2150c67029b7f007892a38f996f 100644 (file)
--- a/Zend/zend_unicode.h
+++ b/Zend/zend_unicode.h
@@ -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);
 

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 1db569274056d29705e671b2c20a4999c541f27d..b7051744790f4ff8cfe12a4ea54eb0be9d74297e 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -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;