From: drh <drh@noemail.net>
Date: Wed, 1 Feb 2017 15:19:29 +0000 (+0000)
Subject: Fix the build by making the OPFLAG_ISNOOP macro available unconditionally.
X-Git-Tag: version-3.17.0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1650fcb1b5627ec7ab2a514b9a42920e8e739ac7;p=thirdparty%2Fsqlite.git

Fix the build by making the OPFLAG_ISNOOP macro available unconditionally.

FossilOrigin-Name: 510933cb24c5bf883265af3a6075e60a4b5ffa37
---

diff --git a/manifest b/manifest
index b3f47391f1..8145330051 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sdocumentation\scomment\sin\ssqlite.h.in\sfor\ssqlite3_preupdate_hook().
-D 2017-02-01T14:19:43.743
+C Fix\sthe\sbuild\sby\smaking\sthe\sOPFLAG_ISNOOP\smacro\savailable\sunconditionally.
+D 2017-02-01T15:19:29.202
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -398,7 +398,7 @@ F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
 F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
-F src/sqliteInt.h 6f29b23415ce207c2fda61054bf244b74f96359c
+F src/sqliteInt.h 3724c48e82605b471bbf7e41109b5850c6e89f31
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1552,7 +1552,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 964bdc27f8f1b1db2e5c0c2a65c8156614cbe087
-R c3a8e9059dd92e8c282633700ca50a30
-U dan
-Z fded3ef392ff672f8205c955a05c2af4
+P 7f8570208c06c056d426e9299d9930181a0464f8
+R bbb1f490f7311ec1c087c3ef4607e5e0
+U drh
+Z 645035379b970696e5aed344f8a4be19
diff --git a/manifest.uuid b/manifest.uuid
index dda985aaff..0823e8bab6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f8570208c06c056d426e9299d9930181a0464f8
\ No newline at end of file
+510933cb24c5bf883265af3a6075e60a4b5ffa37
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4a28ebcd5a..3faf9d3982 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3057,9 +3057,7 @@ struct AuthContext {
 #define OPFLAG_ISUPDATE      0x04    /* This OP_Insert is an sql UPDATE */
 #define OPFLAG_APPEND        0x08    /* This is likely to be an append */
 #define OPFLAG_USESEEKRESULT 0x10    /* Try to avoid a seek in BtreeInsert() */
-#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
 #define OPFLAG_ISNOOP        0x40    /* OP_Delete does pre-update-hook only */
-#endif
 #define OPFLAG_LENGTHARG     0x40    /* OP_Column only used for length() */
 #define OPFLAG_TYPEOFARG     0x80    /* OP_Column only used for typeof() */
 #define OPFLAG_BULKCSR       0x01    /* OP_Open** used to open bulk cursor */