diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 08:27:43 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 08:27:43 +0200 |
| commit | 97c5172ac78c056ba28199d907259376e7c3c3a2 (patch) | |
| tree | c27d0e0c2cb845a492530f9e7fe6be29da5a602a /ext/sqlite3/sqlite3.c | |
| parent | 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (diff) | |
| parent | 53c4c571b3d3b7891526ff616e69c4d74a04afe5 (diff) | |
| download | php-git-97c5172ac78c056ba28199d907259376e7c3c3a2.tar.gz | |
Merge remote-tracking branch 'php/master'
Conflicts:
ext/date/lib/parse_date.c
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 075d43b7bc..0e052785ad 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1396,8 +1396,8 @@ PHP_METHOD(sqlite3stmt, bindParam) php_sqlite3_stmt *stmt_obj; zval *object = getThis(); struct php_sqlite3_bound_param param = {0}; - stmt_obj = Z_SQLITE3_STMT_P(object); zval *parameter; + stmt_obj = Z_SQLITE3_STMT_P(object); param.param_number = -1; param.type = SQLITE3_TEXT; @@ -1430,8 +1430,8 @@ PHP_METHOD(sqlite3stmt, bindValue) php_sqlite3_stmt *stmt_obj; zval *object = getThis(); struct php_sqlite3_bound_param param = {0}; - stmt_obj = Z_SQLITE3_STMT_P(object); zval *parameter; + stmt_obj = Z_SQLITE3_STMT_P(object); param.param_number = -1; param.type = SQLITE3_TEXT; |