com php-src: use Z* macro name: ext/pdo_firebird/firebird_s tatement.c ext/pdo_mysql/mysql_statement.c ext/pdo _sqlite/sqlite_statement.c

Commit: 01c844a01dc6e4e819f0568682cd1b71a4dcb0ff Author: Anatol Belski <ab@php.net> Thu, 5 Nov 2015 22:39:10 +0100 Parents: 2283551cfa8f6720d13ad396e8f3da1bc4f52389 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01c844a01dc6e4e819f0568682cd1b71a4dcb0ff Log: use Z* macro name Changed paths: M ext/pdo_firebird/firebird_statement.c M ext/pdo_mysql/mysql_statement.c M ext/pdo_sqlite/sqlite_statement.c Diff: diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 5eaf530..5445368 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -529,7 +529,7 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat if (stm) { zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0); zval_ptr_dtor(parameter); - ZVAL_STR(parameter, mem ? mem : STR_EMPTY_ALLOC()); + ZVAL_STR(parameter, mem ? mem : ZSTR_EMPTY_ALLOC()); } else { pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource"); return 0; diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index ac94632..2c7e39b 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -528,7 +528,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da if (stm) { zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0); zval_ptr_dtor(parameter); - ZVAL_STR(parameter, mem ? mem : STR_EMPTY_ALLOC()); + ZVAL_STR(parameter, mem ? mem : ZSTR_EMPTY_ALLOC()); } else { pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource"); return 0; diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 93807c8..efe84c1 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -143,7 +143,7 @@ static int pdo_sqlite_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_d if (stm) { zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0); zval_ptr_dtor(parameter); - ZVAL_STR(parameter, mem ? mem : STR_EMPTY_ALLOC()); + ZVAL_STR(parameter, mem ? mem : ZSTR_EMPTY_ALLOC()); } else { pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource"); return 0;