Fix further fts5 compilation issues.

FossilOrigin-Name: 0d7f301fb03c8546a5dbce5d061a1d74e3c86bcf

diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index c90a2e4708dfdfd03f5e9eab874b869807982546..96c02c04cf259e405c7f74643f23e2a21a40b25c 100644 (file)
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -32,6 +32,10 @@ typedef struct Fts5ExprTerm Fts5ExprTerm;
 void *sqlite3Fts5ParserAlloc(void *(*mallocProc)(u64));
 void sqlite3Fts5ParserFree(void*, void (*freeProc)(void*));
 void sqlite3Fts5Parser(void*, int, Fts5Token, Fts5Parse*);
+#ifndef NDEBUG
+void sqlite3Fts5ParserTrace(FILE*, char*);
+#endif
+
 
 struct Fts5Expr {
   Fts5Index *pIndex;
@@ -2276,6 +2280,11 @@ int sqlite3Fts5ExprInit(Fts5Global *pGlobal, sqlite3 *db){
     rc = sqlite3_create_function(db, p->z, -1, SQLITE_UTF8, pCtx, p->x, 0, 0);
   }
 
+  /* Avoid a warning indicating that sqlite3Fts5ParserTrace() is unused */
+#ifndef NDEBUG
+  (void)sqlite3Fts5ParserTrace;
+#endif
+
   return rc;
 }
 

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index b5f00297ebf7d6555c2b834fc301371e3b5c3b60..5aebc97fde174c4c14b2125e66b3462ee658b76f 100644 (file)
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -2454,6 +2454,7 @@ int sqlite3Fts5Init(sqlite3 *db){
   return rc;
 }
 
+#ifndef SQLITE_CORE
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -2466,6 +2467,7 @@ int sqlite3_fts_init(
   (void)pzErrMsg;  /* Unused parameter */
   return sqlite3Fts5Init(db);
 }
+#endif
 
 #ifdef _WIN32
 __declspec(dllexport)

diff --git a/ext/fts5/tool/mkfts5c.tcl b/ext/fts5/tool/mkfts5c.tcl
index 478fd7c01d6c27dd5acd8b1dc85b757b5ed11412..5a5eeae0af07852c0b84e2c8704a886a6e5e250e 100644 (file)
--- a/ext/fts5/tool/mkfts5c.tcl
+++ b/ext/fts5/tool/mkfts5c.tcl
@@ -7,6 +7,7 @@ set G(src) [string map [list %dir% $srcdir] {
   %dir%/fts5.h
   %dir%/fts5Int.h
   fts5parse.h
+  fts5parse.c
   %dir%/fts5_aux.c
   %dir%/fts5_buffer.c
   %dir%/fts5_config.c
@@ -19,7 +20,6 @@ set G(src) [string map [list %dir% $srcdir] {
   %dir%/fts5_unicode2.c
   %dir%/fts5_varint.c
   %dir%/fts5_vocab.c
-  fts5parse.c
 }]
 
 set G(hdr) {

diff --git a/main.mk b/main.mk
index 95903b978ec7ab69aef7f21df199a8f29d6a8b4c..72e52d1061248e9f44298a5eec5fd71a3124efe2 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -332,8 +332,7 @@ TESTSRC += \
   $(TOP)/ext/misc/wholenumber.c \
   $(TOP)/ext/misc/vfslog.c \
   $(TOP)/ext/fts5/fts5_tcl.c \
-  $(TOP)/ext/fts5/fts5_test_mi.c \
-  fts5.c
+  $(TOP)/ext/fts5/fts5_test_mi.c 
 
 
 #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
@@ -718,9 +717,9 @@ testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
                $(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
                -o testfixture$(EXE) $(LIBTCL) libsqlite3.a $(THREADLIB)
 
-amalgamation-testfixture$(EXE): sqlite3.c fts5.c $(TESTSRC) $(TOP)/src/tclsqlite.c
+amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
        $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-               $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts5.c           \
+               $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c                  \
                -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
 
 fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c

diff --git a/manifest b/manifest
index 34515a68de357cbbdd51884f6fedfc53d6e73c02..f6e22b3a23d413b4a30d4edbdbd327c690e56c6a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stwo\smore\swarnings\sin\sfts5\scode.
-D 2015-10-08T20:28:33.424
+C Fix\sfurther\sfts5\scompilation\sissues.
+D 2015-10-08T20:40:18.323
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 336f9494810fe361b59aa4e0c5cd41fc64d83323
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -110,10 +110,10 @@ F ext/fts5/fts5Int.h ed6c05b803e0bacf85228a8d255853e89796f6f5
 F ext/fts5/fts5_aux.c b09aa27dcdaa3d50a30be433fddaa48a50aa827b
 F ext/fts5/fts5_buffer.c b2fb69c1ee3378956c0d9ee964d61b59d296afaf
 F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
-F ext/fts5/fts5_expr.c 2054e550e75cffa117557c9416210c425934436d
+F ext/fts5/fts5_expr.c d3a56928f8afdd2dca9126f8406f20b9831e4265
 F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
 F ext/fts5/fts5_index.c e03217c37f344f79673be385de6b03f732291000
-F ext/fts5/fts5_main.c 77721fed36cf17c881a9f718e779d2bf33edf021
+F ext/fts5/fts5_main.c d159079e618399f9b531ad1fe32772cff307ea91
 F ext/fts5/fts5_storage.c df061a5caf9e50fbbd43113009b5b248362f4995
 F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
 F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
@@ -186,7 +186,7 @@ F ext/fts5/test/fts5version.test 978f59541d8cef7e8591f8be2115ec5ccb863e2e
 F ext/fts5/test/fts5vocab.test cdf97b9678484e9bad5062edf9c9106e5c3b0c5c
 F ext/fts5/tool/fts5txt2db.tcl 3d19fb8ffb234031d33d7d2151acfbc55e9cfcc4
 F ext/fts5/tool/loadfts5.tcl 58e90407cc5c2b1770460119488fd7c0090d4dd3
-F ext/fts5/tool/mkfts5c.tcl 1df2d86c4f9675e9cdb70b4ff5a53e57aca8a5c0
+F ext/fts5/tool/mkfts5c.tcl 52a2bae4dd05ca2c635d7f744e7dd684a1401570
 F ext/fts5/tool/showfts5.tcl 9eaf6c3df352f98a2ab5ce1921dd94128ab1381d
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
@@ -264,7 +264,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 40bed4c4b5719ee1aef9ce24eddd8bb50db9dd99
+F main.mk f890212d1fb0dc1dccbf29ca073e25049a035f9c
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -1390,7 +1390,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e9e76e12812b9b42b1142246b71cea98e26903aa
-R 3ea307db4af2caf63f312c7ebd57ad22
+P 5343e601fb6f0f24f4e4d5d442f7b5b074734143
+R a5d6a1bbd24ea26e1ba62ab9db596efb
 U dan
-Z bfe83218c323cc99da5efd4c0ac84f4a
+Z 4d77dbaecef082f61a7a492bc89aab25

diff --git a/manifest.uuid b/manifest.uuid
index 54fe4e7ce6c3afc106cd243b7f6b626ead069bfc..7c72947b42411d88691f54d5babdca5315adb34d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5343e601fb6f0f24f4e4d5d442f7b5b074734143
\ No newline at end of file
+0d7f301fb03c8546a5dbce5d061a1d74e3c86bcf
\ No newline at end of file