From: drh Date: Mon, 8 Feb 2016 20:06:52 +0000 (+0000) Subject: Fix a compiler warning when compiling without SQLITE_ENABLE_FTS3_TOKENIZER. X-Git-Tag: version-3.11.0~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83d7920e551c33cf93c8104cf44fc23117b5414b;p=thirdparty%2Fsqlite.git Fix a compiler warning when compiling without SQLITE_ENABLE_FTS3_TOKENIZER. FossilOrigin-Name: 6926f28cd56bf61f7c92877baa54024bee7cbab5 --- diff --git a/ext/fts3/fts3_tokenizer.c b/ext/fts3/fts3_tokenizer.c index 26bac57648..fcabe5cca2 100644 --- a/ext/fts3/fts3_tokenizer.c +++ b/ext/fts3/fts3_tokenizer.c @@ -336,6 +336,7 @@ finish: Tcl_DecrRefCount(pRet); } +#ifdef SQLITE_ENABLE_FTS3_TOKENIZER static int registerTokenizer( sqlite3 *db, @@ -357,6 +358,8 @@ int registerTokenizer( return sqlite3_finalize(pStmt); } +#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ + static int queryTokenizer( diff --git a/manifest b/manifest index 2ad9b86f00..7b991aaa7c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Disable\sthe\stwo-argument\sform\sof\sthe\sfts3_tokenizer()\sSQL\sfunction\sunless\sthe\slibrary\sis\sbuilt\swith\s-DSQLITE_ENABLE_FTS3_TOKENIZER. -D 2016-02-08T19:40:17.991 +C Fix\sa\scompiler\swarning\swhen\scompiling\swithout\sSQLITE_ENABLE_FTS3_TOKENIZER. +D 2016-02-08T20:06:52.183 F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc fcf377286d910b47e072da1ac7945976337c0925 @@ -83,7 +83,7 @@ F ext/fts3/fts3_snippet.c 68ae118b0f834ea53d2b89e4087fc0f0b8c4ee4e F ext/fts3/fts3_term.c 88c55a6fa1a51ab494e33dced0401a6c28791fd7 F ext/fts3/fts3_test.c 8a3a78c4458b2d7c631fcf4b152a5cd656fa7038 F ext/fts3/fts3_tokenize_vtab.c a27593ab19657166f6fa5ec073b678cc29a75860 -F ext/fts3/fts3_tokenizer.c 0d3a77bbdc6f394d302f24980fa80667371c6e68 +F ext/fts3/fts3_tokenizer.c 4bd72f767f61c9ce5a7575c844e8d1ed2c3c561a F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004 F ext/fts3/fts3_unicode.c a93f5edc0aff44ef8b06d7cb55b52026541ca145 @@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a050e6f096d40aa5b6275797b96e62c228044f5a -R b09b6ba902e95153c88d724675282802 -U dan -Z a5b8919de2cf0c2997cac75a4e3c3a2c +P e0eb217aca7e4aadf9c44ed20822b78139f7c83c +R 3ba2bfd061690101a8667e8fadcc2696 +U drh +Z 2da14d7bb409b5abdcdd912d6af6bf8a diff --git a/manifest.uuid b/manifest.uuid index fcaa3cc3b9..116910222d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e0eb217aca7e4aadf9c44ed20822b78139f7c83c \ No newline at end of file +6926f28cd56bf61f7c92877baa54024bee7cbab5 \ No newline at end of file