Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Fix ZTS build

migration/RELEASE_1_0_0
Hannes Magnusson 20 years ago
parent
1b11ae1e74
commit
950ab95207
3 changed files with 21 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      Zend/zend_API.h
  2. 2
      ext/pdo_pgsql/pgsql_driver.c
  3. 3
      ext/standard/basic_functions.c

36
Zend/zend_API.h
View File

@ -429,7 +429,7 @@ ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
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 @@ ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
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 @@ ZEND_API int add_ascii_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *v
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 @@ ZEND_API int add_ascii_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *v
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 @@ ZEND_API int add_rt_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *valu
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 @@ ZEND_API int add_rt_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *valu
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 @@ ZEND_API int add_utf8_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *va
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 @@ ZEND_API int add_utf8_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *va
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 @@ ZEND_API int add_utf8_property_zval_ex(zval *arg, char *key, uint key_len, zval
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 @@ ZEND_API int add_utf8_property_zval_ex(zval *arg, char *key, uint key_len, zval
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 @@ ZEND_API int add_u_assoc_zval_ex(zval *arg, zend_uchar type, zstr key, uint key_
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 @@ ZEND_API int add_u_assoc_zval_ex(zval *arg, zend_uchar type, zstr key, uint key_
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 @@ ZEND_API int add_index_zval(zval *arg, ulong index, zval *value);
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 @@ ZEND_API int add_index_zval(zval *arg, ulong index, zval *value);
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 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value);
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 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value);
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 @@ END_EXTERN_C()
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 @@ END_EXTERN_C()
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) { \

2
ext/pdo_pgsql/pgsql_driver.c
View File

@ -87,7 +87,7 @@ int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const char *
}
if (!dbh->methods) {
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
*pdo_err, einfo->errcode, einfo->errmsg);
}

3
ext/standard/basic_functions.c
View File

@ -5573,6 +5573,7 @@ static int php_ini_get_option(zend_ini_entry *ini_entry, int num_args, va_list a
zval *ini_array = va_arg(args, zval *);
int module_number = va_arg(args, int);
zval *option;
TSRMLS_FETCH();
if (module_number != 0 && ini_entry->module_number != module_number) {
return 0;
@ -5707,7 +5708,7 @@ PHP_FUNCTION(ini_set)
char *temp;
int temp_len;
zend_unicode_to_string(UG(utf8_conv), &temp, &temp_len, new_value.u, new_value_len);
zend_unicode_to_string(UG(utf8_conv), &temp, &temp_len, new_value.u, new_value_len TSRMLS_CC);
new_value.s = temp;
new_value_len = temp_len;
}

Write Preview
Loading…
Cancel
Save