From: dan <dan@noemail.net>
Date: Tue, 9 Jan 2018 14:30:49 +0000 (+0000)
Subject: Do not attempt to build the code in ext/expert/sqlite3expert.c if
X-Git-Tag: version-3.22.0~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f87ae41f52f86c9aa05fd0f0933acdb3431f5f2c;p=thirdparty%2Fsqlite.git

Do not attempt to build the code in ext/expert/sqlite3expert.c if
SQLITE_OMIT_VIRTUALTABLE is defined.

FossilOrigin-Name: ba967ad2e38590fe2a51e814a087140089be5e6a06a795a958e70a8a47f6350f
---

diff --git a/ext/expert/expert1.test b/ext/expert/expert1.test
index 3b3425f07f..3d693ec2e7 100644
--- a/ext/expert/expert1.test
+++ b/ext/expert/expert1.test
@@ -23,6 +23,11 @@ if {![info exists testdir]} {
 source $testdir/tester.tcl
 set testprefix expert1
 
+if {[info commands sqlite3_expert_new]==""} {
+  finish_test
+  return
+}
+
 set CLI [test_binary_name sqlite3]
 set CMD [test_binary_name sqlite3_expert]
 
diff --git a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c
index f347ddea6d..fd09478fb5 100644
--- a/ext/expert/sqlite3expert.c
+++ b/ext/expert/sqlite3expert.c
@@ -15,6 +15,8 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE 
+
 typedef sqlite3_int64 i64;
 typedef sqlite3_uint64 u64;
 
@@ -1932,3 +1934,5 @@ void sqlite3_expert_destroy(sqlite3expert *p){
     sqlite3_free(p);
   }
 }
+
+#endif /* ifndef SQLITE_OMIT_VIRTUAL_TABLE */
diff --git a/ext/expert/test_expert.c b/ext/expert/test_expert.c
index ad83872f9a..064c1908a9 100644
--- a/ext/expert/test_expert.c
+++ b/ext/expert/test_expert.c
@@ -26,6 +26,8 @@
 #  endif
 #endif
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+
 /*
 ** Extract an sqlite3* db handle from the object passed as the second
 ** argument. If successful, set *pDb to point to the db handle and return
@@ -195,7 +197,10 @@ static int SQLITE_TCLAPI test_sqlite3_expert_new(
   return rc;
 }
 
+#endif  /* ifndef SQLITE_OMIT_VIRTUALTABLE */
+
 int TestExpert_Init(Tcl_Interp *interp){
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   struct Cmd {
     const char *zCmd;
     Tcl_ObjCmdProc *xProc;
@@ -208,7 +213,7 @@ int TestExpert_Init(Tcl_Interp *interp){
     struct Cmd *p = &aCmd[i];
     Tcl_CreateObjCommand(interp, p->zCmd, p->xProc, 0, 0);
   }
-
+#endif
   return TCL_OK;
 }
 
diff --git a/manifest b/manifest
index 3e04ddeb45..8fd167235a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\sfix\sthe\sfileio.c\sextension\sso\sthat\sit\sbuilds\son\sMinGW-64.
-D 2018-01-09T14:27:58.076
+C Do\snot\sattempt\sto\sbuild\sthe\scode\sin\sext/expert/sqlite3expert.c\sif\nSQLITE_OMIT_VIRTUALTABLE\sis\sdefined.
+D 2018-01-09T14:30:49.074
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 12b6daa4bdb03fa87da27cbc205ff88ace645475b5be79414a3038b68ade14cb
@@ -44,10 +44,10 @@ F ext/async/sqlite3async.c 0f3070cc3f5ede78f2b9361fb3b629ce200d7d74
 F ext/async/sqlite3async.h f489b080af7e72aec0e1ee6f1d98ab6cf2e4dcef
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c 4791c5e064aea81b2b829fa95228b22283380ee370ea88a1e580103b75516ebf
-F ext/expert/expert1.test 0c71a3453ce3a0b4dbe952713aec0ae8d416dd846820dd027b08f305f5278b30
-F ext/expert/sqlite3expert.c 9d352d8693a997402095a16791122ca5c1bff7627faee3625509fcaaef9b30db
+F ext/expert/expert1.test fd21496d8e52c817a7741f467f42b0502c0ac7e07dcdd1d6e15a3e8154ed4e41
+F ext/expert/sqlite3expert.c 9f1b0a5ea34abe1ccd0e9aae6ba5f96865c0f08373a731dd1ed6226074a3d75b
 F ext/expert/sqlite3expert.h af6354f8ee5c9e025024e63fec3bd640a802afcc3099a44d804752cf0791d811
-F ext/expert/test_expert.c 85f5c743a899063fa48296d21de2f32c26d09a21c8582b2a0bc482e8de183e7a
+F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
 F ext/fts1/ft_hash.h 06df7bba40dadd19597aa400a875dbc2fed705ea
@@ -1697,7 +1697,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 5fed67033c9dd4492bf8cfcf98874284581f448d8cc84fa5470dde239f218375
-R 0ecfe311a33b1c3c21c3c128af696033
-U drh
-Z 00bdd39cf3e409343f20bbdc5609780f
+P a7446d3217d39c96c884fbfb294dd320378255f3bfb34e35d15ba6d7c6698f53
+R e70943770a9fc04a23bf01555115b0a6
+U dan
+Z 4badcc0edcd89f4a5802d71ebe94c4d8
diff --git a/manifest.uuid b/manifest.uuid
index ff7756ae2e..272863cff3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7446d3217d39c96c884fbfb294dd320378255f3bfb34e35d15ba6d7c6698f53
\ No newline at end of file
+ba967ad2e38590fe2a51e814a087140089be5e6a06a795a958e70a8a47f6350f
\ No newline at end of file