From: drh <drh@noemail.net>
Date: Sat, 17 Nov 2018 14:26:45 +0000 (+0000)
Subject: Fix harmless compiler warnings that appear with SQLITE_OMIT_EXPLAIN.
X-Git-Tag: version-3.26.0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92cd307c1cc0a5399828cd69913270e15369c514;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings that appear with SQLITE_OMIT_EXPLAIN.

FossilOrigin-Name: 5fff00b0d5eb634d40e767671d5a0e8bd263d15d88abe531f6072f01bc789568
---

diff --git a/manifest b/manifest
index cbe81c7d51..fc8934e3de 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sC++-style\scomment.
-D 2018-11-17T14:19:34.752
+C Fix\sharmless\scompiler\swarnings\sthat\sappear\swith\sSQLITE_OMIT_EXPLAIN.
+D 2018-11-17T14:26:45.996
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in b730006b54c990461d864c5387f2e6f13aadb0236804555fb010ed6865a5f058
@@ -579,7 +579,7 @@ F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 836cadc922de866c849e23a75f93d344cdc143d388339305d09a3fed27e8798d
 F src/vdbe.c 005e691ea4c7d51e6c1a69d9389aeb34700884c85f51681817ddea3fdc2fc39b
 F src/vdbe.h 5081dcc497777efe5e9ebe7330d283a044a005e4bdda2e2e984f03bf89a0d907
-F src/vdbeInt.h 8a52b8db3d20f9755a965d864b8653052c7ef1ccadceb2e057047cd421f6336e
+F src/vdbeInt.h 437e6c6af679fdf157867eb83a8adc6cf5145d6774453c2214cfd0bd01d92980
 F src/vdbeapi.c ecccfce6f614c33a95952efeec969d163e8349eac314ee2b7b163eda921b5eb0
 F src/vdbeaux.c f547901b1aa9e2d81c63f06893f633648e434180666a827aacb547d7d6c8a601
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
@@ -1778,7 +1778,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 acfd0a05a8957728c1f0eb936f4121ce26f291f20dd583bd57ce2bb271617d3f
-R caaaaddc0dbd175ac1ef1ee62293c489
+P 645232f2b9ce3ee345b1d22c0db1265e39bb674bef9ab6fb10d5bee8ab696787
+R 87582819beddef4f834350949cb9721e
 U drh
-Z b501d7a1ce3a1b675f4d435451e01e61
+Z 0521ae8f2e49a5fca6df6229f983c5f9
diff --git a/manifest.uuid b/manifest.uuid
index b7f84e07c6..595acbbd22 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-645232f2b9ce3ee345b1d22c0db1265e39bb674bef9ab6fb10d5bee8ab696787
\ No newline at end of file
+5fff00b0d5eb634d40e767671d5a0e8bd263d15d88abe531f6072f01bc789568
\ No newline at end of file
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 1cb7219611..5c719923d7 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -471,7 +471,9 @@ int sqlite2BtreeKeyCompare(BtCursor *, const void *, int, int, int *);
 int sqlite3VdbeIdxKeyCompare(sqlite3*,VdbeCursor*,UnpackedRecord*,int*);
 int sqlite3VdbeIdxRowid(sqlite3*, BtCursor*, i64*);
 int sqlite3VdbeExec(Vdbe*);
+#ifndef SQLITE_OMIT_EXPLAIN
 int sqlite3VdbeList(Vdbe*);
+#endif
 int sqlite3VdbeHalt(Vdbe*);
 int sqlite3VdbeChangeEncoding(Mem *, int);
 int sqlite3VdbeMemTooBig(Mem*);
@@ -510,7 +512,9 @@ int sqlite3VdbeMemFinalize(Mem*, FuncDef*);
 #ifndef SQLITE_OMIT_WINDOWFUNC
 int sqlite3VdbeMemAggValue(Mem*, Mem*, FuncDef*);
 #endif
+#ifndef SQLITE_OMIT_EXPLAIN
 const char *sqlite3OpcodeName(int);
+#endif
 int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve);
 int sqlite3VdbeMemClearAndResize(Mem *pMem, int n);
 int sqlite3VdbeCloseStatement(Vdbe *, int);