Attempt to get DBSTAT to compile without warnings across all build

configurations.

FossilOrigin-Name: c3cbe3b06eb37b9949c5fcb0e257a845953de7a7

diff --git a/manifest b/manifest
index d95104e767c4910cc09259612501f236f1499088..46b8084a52bc2607c0b0e33e0de6a229743e0a3e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompiler\swarning\swhen\sbuilding\swith\stclsqlite3.c\sand\swithout\nSQLITE_ENABLE_DBSTAT_VTAB.
-D 2015-05-12T14:22:05.884
+C Attempt\sto\sget\sDBSTAT\sto\scompile\swithout\swarnings\sacross\sall\sbuild\nconfigurations.
+D 2015-05-12T19:10:18.469
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -181,7 +181,7 @@ F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
 F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
 F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
-F src/dbstat.c d0b0757e491936a03768867dcfce271d28ef9a68
+F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
 F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
 F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
@@ -1258,7 +1258,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f1aa951a337037c18ee14e114e36314835e05926
-R 7fd0d11b6a2c1402aea56f1ab8267c55
+P aad3ff257a156b572334b64aa57643ff3ea231a4
+R a7da5ff564874b4b543b1f2446af493d
 U drh
-Z 5370d82879dee02ccaf08bd80ca71d1a
+Z 76dbe37865affc77525affd7f0404dba

diff --git a/manifest.uuid b/manifest.uuid
index cba7135cf5660701e71d9f433321ca872942648c..788a18d04274d19dd25a4476347e7232b2544469 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aad3ff257a156b572334b64aa57643ff3ea231a4
\ No newline at end of file
+c3cbe3b06eb37b9949c5fcb0e257a845953de7a7
\ No newline at end of file

diff --git a/src/dbstat.c b/src/dbstat.c
index 9b84c9ccf4b57c9db818f4b685c40112d791b3f5..c36be020af371643c6bc0120f0a602902276e397 100644 (file)
--- a/src/dbstat.c
+++ b/src/dbstat.c
@@ -18,9 +18,9 @@
 ** for an example implementation.
 */
 
+#include "sqliteInt.h"   /* Requires access to internal data structures */
 #if (defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)) \
     && !defined(SQLITE_OMIT_VIRTUALTABLE)
-#include "sqliteInt.h"   /* Requires access to internal data structures */
 
 /*
 ** Page paths: