com php-src: - Fixed ZTS build: ext/iconv/iconv.c ext/pdo_sql ite/sqlite_driver.c ext/session/mod_files.c

Commit: 920d298f4a3ad7fd2f2f79bbdf09b7d5b4667ae0 Author: Felipe Pena <felipensp@gmail.com> Tue, 13 May 2014 00:34:10 -0300 Parents: 9f9ee0186eb3d1fcc2b3a4ecc55a0195233fd670 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=920d298f4a3ad7fd2f2f79bbdf09b7d5b4667ae0 Log: - Fixed ZTS build Changed paths: M ext/iconv/iconv.c M ext/pdo_sqlite/sqlite_driver.c M ext/session/mod_files.c Diff: diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 2867742..39c5b31 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -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; diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index ebb16d9..9b47af5 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -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)) { diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 3e577bc..dd9361b 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -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) {