From: drh <drh@noemail.net>
Date: Fri, 19 Feb 2016 13:20:02 +0000 (+0000)
Subject: Add an SQLITE_DISABLE_INTRINSIC #ifdef to the sqlite3Put4Byte() function.
X-Git-Tag: version-3.12.0~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=469753d94997464872b5d58f4b727f77b766abf8;p=thirdparty%2Fsqlite.git

Add an SQLITE_DISABLE_INTRINSIC #ifdef to the sqlite3Put4Byte() function.

FossilOrigin-Name: ba9c6827d0890aaed9168c221fefbdbe89f4f9d3
---

diff --git a/manifest b/manifest
index e6db1216e9..6ac0529235 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\sunused\syyzerominor\sconstant.
-D 2016-02-19T13:19:22.204
+C Add\san\sSQLITE_DISABLE_INTRINSIC\s#ifdef\sto\sthe\ssqlite3Put4Byte()\sfunction.
+D 2016-02-19T13:20:02.042
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
@@ -412,7 +412,7 @@ F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
 F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
-F src/util.c 8073bbdab9cc7209f6741bd44264ede606cbadc6
+F src/util.c 38c06684c922694809ccb988a13562c16890a3d5
 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 F src/vdbe.c 4eef77da4b81763a25992cc060506c001ebd4e3d
 F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
@@ -1428,7 +1428,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f9c49ba1edf13cb8c48d73f1b2e3f80c46b3c030
-R c2e30a818a1524ebcac066213d2c2f9a
+P 60ad68a9f569d2446d76a6453be4fa1c4ed2cd93
+R d12bbc92c78d2cfaf446c5b734b63a28
 U drh
-Z d1500e5cad7d5894b150d951c2ce99ae
+Z 22d2505e89be374674fd2948e46d1040
diff --git a/manifest.uuid b/manifest.uuid
index 77efe13df0..6d8b3f854a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60ad68a9f569d2446d76a6453be4fa1c4ed2cd93
\ No newline at end of file
+ba9c6827d0890aaed9168c221fefbdbe89f4f9d3
\ No newline at end of file
diff --git a/src/util.c b/src/util.c
index 928d249215..e325a7311b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1116,10 +1116,12 @@ 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__) && GCC_VERSION>=4003000
+#elif SQLITE_BYTEORDER==1234 && !defined(SQLITE_DISABLE_INTRINSIC) \
+    && defined(__GNUC__) && GCC_VERSION>=4003000
   u32 x = __builtin_bswap32(v);
   memcpy(p,&x,4);
-#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 = _byteswap_ulong(v);
   memcpy(p,&x,4);
 #else