diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2007-04-09 16:35:11 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2007-04-09 16:35:11 +0000 |
| commit | eb8d30f9122748c70fab74445205011a58c5988e (patch) | |
| tree | 1e6df4121f0eaad252f608a1f95076c345f59d5b /ext/pdo_sqlite/sqlite/src/vdbeapi.c | |
| parent | 857f992cd3c64d6338e221a6decfd4a94e6a1b08 (diff) | |
| download | php-git-eb8d30f9122748c70fab74445205011a58c5988e.tar.gz | |
Upgrade libsqlite 3 inside PDO sqlite to version 3.3.15
Diffstat (limited to 'ext/pdo_sqlite/sqlite/src/vdbeapi.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite/src/vdbeapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_sqlite/sqlite/src/vdbeapi.c b/ext/pdo_sqlite/sqlite/src/vdbeapi.c index 9440bbd105..3d3d815c7f 100644 --- a/ext/pdo_sqlite/sqlite/src/vdbeapi.c +++ b/ext/pdo_sqlite/sqlite/src/vdbeapi.c @@ -341,7 +341,7 @@ void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){ }else{ pMem->flags = MEM_Agg; pMem->xDel = sqlite3FreeX; - *(FuncDef**)&pMem->i = p->pFunc; + pMem->u.pDef = p->pFunc; if( nByte<=NBFS ){ pMem->z = pMem->zShort; memset(pMem->z, 0, nByte); @@ -443,7 +443,7 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){ Vdbe *pVm = (Vdbe *)pStmt; int vals = sqlite3_data_count(pStmt); if( i>=vals || i<0 ){ - static const Mem nullMem = {0, 0.0, "", 0, MEM_Null, MEM_Null }; + static const Mem nullMem = {{0}, 0.0, "", 0, MEM_Null, MEM_Null }; sqlite3Error(pVm->db, SQLITE_RANGE, 0); return (Mem*)&nullMem; } |