diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:51:45 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:51:45 +0200 |
| commit | bc0161b72063f79bd80af3cfefe28a4f20115610 (patch) | |
| tree | 16abc6bc60533d2e39b4a6d418351191050cabb5 /ext/pdo_sqlite/sqlite_driver.c | |
| parent | d24c5de1732d44937ee33ba4a198d13af8f69fc9 (diff) | |
| parent | 618de55485965f3ca6e1fecafd9414da3afa6d5c (diff) | |
| download | php-git-bc0161b72063f79bd80af3cfefe28a4f20115610.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (5) and others
# Via Xinchen Hui (3) and Dmitry Stogov (1)
* 'phpng' of git.php.net:php-src:
restore unexpected commit
Convert to unpacked before deleting elements
- Fixed ZTS build
Fix memory error in spl_directory.c
Fix spl_directory cast_object, reenable error
Support for ext/phar (all tests passed)
ext/phar support (incomplete)
Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
Fixed typo
Refactoring ext/xmlrpc (incompleted)
Removed error message that breaks phar
ext/phar support (incomplete)
Refactor ext/gd (all tests passes)
Fixed wrong buffer length (added place for terminating zero)
Diffstat (limited to 'ext/pdo_sqlite/sqlite_driver.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)) { |