clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed ZTS build

Browse Source
This commit is contained in:
Felipe Pena 2014-05-13 00:34:10 -03:00
parent 9f9ee0186e
commit 920d298f4a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/iconv/iconv.c
View File

@ -449,7 +449,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c
if (output_context->in.used) {
zend_string *out;
output_context->out.free = 1;
_php_iconv_show_error(php_iconv_string(output_context->in.data, output_context->in.used, &out, get_output_encoding(TSRMLS_C), get_internal_encoding(TSRMLS_C)), get_output_encoding(TSRMLS_C), get_internal_encoding(TSRMLS_C));
_php_iconv_show_error(php_iconv_string(output_context->in.data, output_context->in.used, &out, get_output_encoding(TSRMLS_C), get_internal_encoding(TSRMLS_C)), get_output_encoding(TSRMLS_C), get_internal_encoding(TSRMLS_C) TSRMLS_CC);
if (out) {
output_context->out.data = estrndup(out->val, out->len);
output_context->out.used = out->len;

4
ext/pdo_sqlite/sqlite_driver.c
View File

@ -533,7 +533,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction)
RETURN_FALSE;
}
dbh = Z_PDO_DBH_P(getThis() TSRMLS_CC);
dbh = Z_PDO_DBH_P(getThis());
PDO_CONSTRUCT_CHECK;
if (!zend_is_callable(callback, 0, &cbname TSRMLS_CC)) {
@ -603,7 +603,7 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
RETURN_FALSE;
}
dbh = Z_PDO_DBH_P(getThis() TSRMLS_CC);
dbh = Z_PDO_DBH_P(getThis());
PDO_CONSTRUCT_CHECK;
if (!zend_is_callable(step_callback, 0, &cbname TSRMLS_CC)) {

2
ext/session/mod_files.c
View File

@ -475,7 +475,7 @@ PS_CREATE_SID_FUNC(files)
PS_FILES_DATA;
do {
sid = php_session_create_id((void**)&data TSRMLS_C);
sid = php_session_create_id((void**)&data TSRMLS_CC);
/* Check collision */
if (data && ps_files_key_exists(data, sid? sid->val : NULL TSRMLS_CC) == SUCCESS) {
if (sid) {