aboutsummaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-07-14 15:39:22 +0000
committerdrh <drh@noemail.net>2015-07-14 15:39:22 +0000
commit38151adfe2f51c07ca50e9cbc6f44a9811097eb1 (patch)
tree44ecb68858c63553a92e23f56db4481f7a620327 /src/util.c
parentbed6de557a5282f92ed5019d5c89129a6ece6bab (diff)
parent201e0c68f7d5d19ba759f56fadd0d58c838c41f9 (diff)
downloadsqlite-38151adfe2f51c07ca50e9cbc6f44a9811097eb1.tar.gz
sqlite-38151adfe2f51c07ca50e9cbc6f44a9811097eb1.zip
Merge trunk changes, including the addition of FTS5 and pcache1 performance
enhancements. FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c
index bafa3cefa..091481d92 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1082,7 +1082,7 @@ u32 sqlite3Get4byte(const u8 *p){
u32 x;
memcpy(&x,p,4);
return x;
-#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__)
+#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__) && GCC_VERSION>=4003000
u32 x;
memcpy(&x,p,4);
return __builtin_bswap32(x);
@@ -1098,7 +1098,7 @@ u32 sqlite3Get4byte(const u8 *p){
void sqlite3Put4byte(unsigned char *p, u32 v){
#if SQLITE_BYTEORDER==4321
memcpy(p,&v,4);
-#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__)
+#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__) && GCC_VERSION>=4003000
u32 x = __builtin_bswap32(v);
memcpy(p,&x,4);
#elif SQLITE_BYTEORDER==1234 && defined(_MSC_VER) && _MSC_VER>=1300