diff options
| author | drh <drh@noemail.net> | 2015-08-20 23:54:25 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-08-20 23:54:25 +0000 |
| commit | 89a10b2d5312ce304906e2ee2f9932302ed2b85b (patch) | |
| tree | efa18c5656cf051fb0d10a1576ec6f12f957dfc7 /src/util.c | |
| parent | 87c44ef2f76229eeb5086e8e5ddb41a0fc6db150 (diff) | |
| parent | 0fee5969c8928e4043416fdc6cdfff738ce40f55 (diff) | |
| download | sqlite-89a10b2d5312ce304906e2ee2f9932302ed2b85b.tar.gz sqlite-89a10b2d5312ce304906e2ee2f9932302ed2b85b.zip | |
Merge recent trunk enhancements, include table-valued functions.
FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index 091481d92..38072a35c 100644 --- a/src/util.c +++ b/src/util.c @@ -1082,11 +1082,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); |