From: drh <drh@noemail.net>
Date: Thu, 2 Apr 2020 12:53:17 +0000 (+0000)
Subject: Add a missing #ifdef to avoid a harmless compiler warning.
X-Git-Tag: version-3.32.0~50^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0ef4e2b47c27c19320ab81f983173bd86709174;p=thirdparty%2Fsqlite.git

Add a missing #ifdef to avoid a harmless compiler warning.

FossilOrigin-Name: cc54de354317ebc080d4d1ee25427b31a49c4a75e01cb5d9966f1aaeb2ad098d
---

diff --git a/manifest b/manifest
index 6ecfce648f..0af47f4e5f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\senhancements\sfrom\strunk.
-D 2020-04-02T12:24:08.483
+C Add\sa\smissing\s#ifdef\sto\savoid\sa\sharmless\scompiler\swarning.
+D 2020-04-02T12:53:17.013
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -605,9 +605,9 @@ F src/util.c a285c1e026907b69fa2592bd05047a565a1d8a1aef2b73c924b6a8ffe772871a
 F src/vacuum.c 813b510ba887fee6492bcb11f2bf77d7eb58b232b83649136372e0a2fc17f4b9
 F src/vdbe.c 972999395eee88702091fb5d50cf4effd07889c371807d222a7f517388e6378e
 F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35
-F src/vdbeInt.h 5f36e2261731e6a39c66c6902634e474d4a98ed14ca10be6dea5c3776ece4342
+F src/vdbeInt.h 01250089f9a90e9342de1c4cc79cbfa86133c251fe94ecb09564fabe122d00b7
 F src/vdbeapi.c d176ee7251d5344de7bb2a0d2dd0fe536834e5843d9bc2389e0f5cdcd5374141
-F src/vdbeaux.c 07b697900b22bd2717cee24ff4cfc3c7433a7e1c62979e687a0d23f2668b9904
+F src/vdbeaux.c 892673818ed28961238907540021cb7035eca2757095aab160f866473201a84f
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
 F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
@@ -1861,7 +1861,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 6283c677d57220e54375a6463f453c6d068e042263558df16cff1055d1b0d3f5 a49f8ec552bede7da731e0571ccf49de1a30e7be3a5673150436c8b411ba6ffc
-R 3169d95f383859bfa6626ea7d2fa0b6d
+P d1731385c077f298b0cf654d6183ed40f7e5c07e4e2ab7f69109cf951ce99d9e
+R 7dc28ba8a275eed6b89f173889480939
 U drh
-Z 88bed112404a5cfaec60f425ff57b550
+Z ff4e168336800c29cfb3e03082888acf
diff --git a/manifest.uuid b/manifest.uuid
index cd1792d40d..3b1237664a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1731385c077f298b0cf654d6183ed40f7e5c07e4e2ab7f69109cf951ce99d9e
\ No newline at end of file
+cc54de354317ebc080d4d1ee25427b31a49c4a75e01cb5d9966f1aaeb2ad098d
\ No newline at end of file
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index a9465cc0ac..2d5cfeff2a 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -500,6 +500,8 @@ int sqlite3VdbeExec(Vdbe*);
 #if !defined(SQLITE_OMIT_EXPLAIN) || defined(SQLITE_ENABLE_BYTECODE_VTAB)
 int sqlite3VdbeNextOpcode(Vdbe*,Mem*,int,int*,int*,Op**);
 char *sqlite3VdbeDisplayP4(sqlite3*,Op*);
+#endif
+#if defined(SQLITE_ENABLE_EXPLAIN_COMMENT)
 char *sqlite3VdbeDisplayComment(sqlite3*,const Op*,const char*);
 #endif
 #if !defined(SQLITE_OMIT_EXPLAIN)
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 7be4601833..4a3bf07311 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1548,7 +1548,7 @@ char *sqlite3VdbeDisplayComment(
   }
   return sqlite3StrAccumFinish(&x);
 }
-#endif /* SQLITE_DEBUG */
+#endif /* SQLITE_ENABLE_EXPLAIN_COMMENTS */
 
 #if VDBE_DISPLAY_P4 && defined(SQLITE_ENABLE_CURSOR_HINTS)
 /*