diff options
| author |   landry <landry@openbsd.org> | 2013-06-09 14:42:05 +0000 |
|---|---|---|
| committer | landry <landry@openbsd.org> | 2013-06-09 14:42:05 +0000 |
| commit | cd69e8a5c6f0a2e7f0abf1cec7d4b61d7e815574 (patch) | |
| tree | d06abfde95a07742304802833c937beba3f86c2b /lib/libsqlite3/src/vdbemem.c | |
| parent | Add test for "true && true && false" and "set -e". (diff) | |
| download | wireguard-openbsd-cd69e8a5c6f0a2e7f0abf1cec7d4b61d7e815574.tar.xz wireguard-openbsd-cd69e8a5c6f0a2e7f0abf1cec7d4b61d7e815574.zip | |
Update to sqlite 3.7.17.
See for changes:
http://www.sqlite.org/releaselog/3_7_16.html
http://www.sqlite.org/releaselog/3_7_16_1.html
http://www.sqlite.org/releaselog/3_7_16_2.html
http://www.sqlite.org/releaselog/3_7_17.html
tested by sebastia@ on vax & sparc, by myself on
hppa/amd64/sparc64/sgi/i386/macppc.
looks ok to espie@
(a lot of kittens died during the preparation of this cvs import)
Diffstat (limited to 'lib/libsqlite3/src/vdbemem.c')
| -rw-r--r-- | lib/libsqlite3/src/vdbemem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/libsqlite3/src/vdbemem.c b/lib/libsqlite3/src/vdbemem.c index fd964de2e91..8fc222e2de2 100644 --- a/lib/libsqlite3/src/vdbemem.c +++ b/lib/libsqlite3/src/vdbemem.c @@ -32,7 +32,9 @@ ** between formats. */ int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ +#ifndef SQLITE_OMIT_UTF16 int rc; +#endif assert( (pMem->flags&MEM_RowSet)==0 ); assert( desiredEnc==SQLITE_UTF8 || desiredEnc==SQLITE_UTF16LE || desiredEnc==SQLITE_UTF16BE ); |