cvs: ZendEngine2 / zend_API.h

bjori Sat Dec 16 18:31:23 2006 UTC Modified files: /ZendEngine2 zend_API.h Log: Fix ZTS build

http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.272&r2=1.273&diff_format=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.272 ZendEngine2/zend_API.h:1.273 --- ZendEngine2/zend_API.h:1.272 Fri Dec 15 22:35:23 2006 +++ ZendEngine2/zend_API.h Sat Dec 16 18:31:23 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.272 2006/12/15 22:35:23 andrei Exp $ */ +/* $Id: zend_API.h,v 1.273 2006/12/16 18:31:23 bjori Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -429,7 +429,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -443,7 +443,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -572,7 +572,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_ascii_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -586,7 +586,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_ascii_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -716,7 +716,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_rt_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -730,7 +730,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_rt_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -860,7 +860,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_utf8_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -874,7 +874,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_utf8_assoc_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1014,7 +1014,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_utf8_property_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1028,7 +1028,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_utf8_property_unicodel_ex(arg, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1132,7 +1132,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_u_assoc_unicodel_ex(arg, type, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1146,7 +1146,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_u_assoc_unicodel_ex(arg, type, key, key_len, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1276,7 +1276,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_index_unicodel(arg, idx, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1290,7 +1290,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_index_unicodel(arg, idx, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1399,7 +1399,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_next_index_unicodel(arg, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1413,7 +1413,7 @@ if (UG(unicode)) { \ UChar *___u_str; \ int ___u_len; \ - if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length) == SUCCESS) { \ + if (zend_string_to_unicode(UG(utf8_conv), &___u_str, &___u_len, str, length TSRMLS_CC) == SUCCESS) { \ add_next_index_unicodel(arg, ___u_str, ___u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1647,7 +1647,7 @@ int __s_len = strlen(__s); \ UChar *u_str; \ int u_len; \ - if (zend_string_to_unicode(conv, &u_str, &u_len, __s, __s_len) == SUCCESS) { \ + if (zend_string_to_unicode(conv, &u_str, &u_len, __s, __s_len TSRMLS_CC) == SUCCESS) { \ ZVAL_UNICODEL(z, u_str, u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \ @@ -1667,7 +1667,7 @@ int __s_len = (l); \ UChar *u_str; \ int u_len; \ - if (zend_string_to_unicode(conv, &u_str, &u_len, __s, __s_len) == SUCCESS) { \ + if (zend_string_to_unicode(conv, &u_str, &u_len, __s, __s_len TSRMLS_CC) == SUCCESS) { \ ZVAL_UNICODEL(z, u_str, u_len, 0); \ } \ if ((flags) & ZSTR_AUTOFREE) { \