diff options
| -rw-r--r-- | ext/iconv/iconv.c | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 4 | ||||
| -rw-r--r-- | ext/session/mod_files.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 28677421d8..39c5b314a8 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 ebb16d9920..9b47af562c 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 3e577bc28a..dd9361b34e 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) { |