diff options
| author |   jturner <jturner@openbsd.org> | 2015-12-23 20:07:36 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2015-12-23 20:07:36 +0000 |
| commit | 454f2601b89e8c6c8f927b542b09b36ffb6763a8 (patch) | |
| tree | 3aeb7f1535c5a957952029d1542c4f4ecd85a695 /lib/libsqlite3/src/util.c | |
| parent | Do undo. (diff) | |
| download | wireguard-openbsd-454f2601b89e8c6c8f927b542b09b36ffb6763a8.tar.xz wireguard-openbsd-454f2601b89e8c6c8f927b542b09b36ffb6763a8.zip | |
Update sqlite3 to 3.9.2. Bump major, regen .pc and header. Changes
available here: http://sqlite.org/changes.html
Tested in bulk by aja@. ok landry@
Diffstat (limited to 'lib/libsqlite3/src/util.c')
| -rw-r--r-- | lib/libsqlite3/src/util.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/libsqlite3/src/util.c b/lib/libsqlite3/src/util.c index 091481d9216..f218bb79417 100644 --- a/lib/libsqlite3/src/util.c +++ b/lib/libsqlite3/src/util.c @@ -1065,11 +1065,8 @@ u8 sqlite3GetVarint32(const unsigned char *p, u32 *v){ ** 64-bit integer. */ int sqlite3VarintLen(u64 v){ - int i = 0; - do{ - i++; - v >>= 7; - }while( v!=0 && ALWAYS(i<9) ); + int i; + for(i=1; (v >>= 7)!=0; i++){ assert( i<9 ); } return i; } @@ -1082,11 +1079,13 @@ u32 sqlite3Get4byte(const u8 *p){ u32 x; memcpy(&x,p,4); return x; -#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__) && GCC_VERSION>=4003000 +#elif SQLITE_BYTEORDER==1234 && !defined(SQLITE_DISABLE_INTRINSIC) \ + && defined(__GNUC__) && GCC_VERSION>=4003000 u32 x; memcpy(&x,p,4); return __builtin_bswap32(x); -#elif SQLITE_BYTEORDER==1234 && defined(_MSC_VER) && _MSC_VER>=1300 +#elif SQLITE_BYTEORDER==1234 && !defined(SQLITE_DISABLE_INTRINSIC) \ + && defined(_MSC_VER) && _MSC_VER>=1300 u32 x; memcpy(&x,p,4); return _byteswap_ulong(x); |