Changes to #ifdefs so that the build goes correctly if the only FTS macro

defined is SQLITE_ENABLE_FTS4.

FossilOrigin-Name: a0b43a320e6491de7070966ed7c3ec55fd660a85

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 988a1a65c660727f705f773d0cd44ac62b67145c..024b1150a2dcd757e867f41efb2ddaa964d4b4c9 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -292,14 +292,13 @@
 ** into a single segment.
 */
 
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
 #if defined(SQLITE_ENABLE_FTS3) && !defined(SQLITE_CORE)
 # define SQLITE_CORE 1
 #endif
 
-#include "fts3Int.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h
index 80604d6fa3c71c495a08a4770227eb55080ee595..06f2c09bb835a30d56c3d3ae6ead6b2b6a843caa 100644 (file)
--- a/ext/fts3/fts3Int.h
+++ b/ext/fts3/fts3Int.h
@@ -11,7 +11,6 @@
 ******************************************************************************
 **
 */
-
 #ifndef _FTSINT_H
 #define _FTSINT_H
 
@@ -19,6 +18,16 @@
 # define NDEBUG 1
 #endif
 
+/*
+** FTS4 is really an extension for FTS3.  It is enabled using the
+** SQLITE_ENABLE_FTS3 macro.  But to avoid confusion we also all
+** the SQLITE_ENABLE_FTS4 macro to serve as an alisse for SQLITE_ENABLE_FTS3.
+*/
+#if defined(SQLITE_ENABLE_FTS4) && !defined(SQLITE_ENABLE_FTS3)
+# define SQLITE_ENABLE_FTS3
+#endif
+
+#ifdef SQLITE_ENABLE_FTS3
 #include "sqlite3.h"
 #include "fts3_tokenizer.h"
 #include "fts3_hash.h"
@@ -502,5 +511,5 @@ int sqlite3Fts3MsrOvfl(Fts3Cursor *, Fts3MultiSegReader *, int *);
 
 int sqlite3Fts3DeferredTokenList(Fts3DeferredToken *, char **, int *);
 
-
+#endif /* SQLITE_ENABLE_FTS3 */
 #endif /* _FTSINT_H */

diff --git a/ext/fts3/fts3_aux.c b/ext/fts3/fts3_aux.c
index 160eff981a3e4fabf6f71ed1b43b32303a442267..ada85d796be04eee4b32d84dafa29e322f0bd858 100644 (file)
--- a/ext/fts3/fts3_aux.c
+++ b/ext/fts3/fts3_aux.c
@@ -11,10 +11,9 @@
 ******************************************************************************
 **
 */
-
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
-#include "fts3Int.h"
 #include <string.h>
 #include <assert.h>
 

diff --git a/ext/fts3/fts3_expr.c b/ext/fts3/fts3_expr.c
index 0383d1a2767c60601932014655fdcead4df6efe8..7eb2962d44126588c5fcf10743012e9957915f05 100644 (file)
--- a/ext/fts3/fts3_expr.c
+++ b/ext/fts3/fts3_expr.c
@@ -15,6 +15,7 @@
 ** syntax is relatively simple, the whole tokenizer/parser system is
 ** hand-coded. 
 */
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
 /*
@@ -77,7 +78,6 @@ int sqlite3_fts3_enable_parentheses = 0;
 */
 #define SQLITE_FTS3_DEFAULT_NEAR_PARAM 10
 
-#include "fts3Int.h"
 #include <string.h>
 #include <assert.h>
 

diff --git a/ext/fts3/fts3_hash.c b/ext/fts3/fts3_hash.c
index 98be52960577a6673cf34b1cd638dce31ddb4692..b7c3e8b5a711f91d3927afc577b0368696438bc7 100644 (file)
--- a/ext/fts3/fts3_hash.c
+++ b/ext/fts3/fts3_hash.c
@@ -23,6 +23,7 @@
 **     * The FTS3 module is being built into the core of
 **       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
 */
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
 #include <assert.h>

diff --git a/ext/fts3/fts3_icu.c b/ext/fts3/fts3_icu.c
index 85390d3b065b5c422fb07d2bdd69614893f56ccf..a10a55d67b9da5799195c4e8863f56a220f1cb6d 100644 (file)
--- a/ext/fts3/fts3_icu.c
+++ b/ext/fts3/fts3_icu.c
@@ -10,10 +10,8 @@
 **
 *************************************************************************
 ** This file implements a tokenizer for fts3 based on the ICU library.
-** 
-** $Id: fts3_icu.c,v 1.3 2008/09/01 18:34:20 danielk1977 Exp $
 */
-
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 #ifdef SQLITE_ENABLE_ICU
 

diff --git a/ext/fts3/fts3_porter.c b/ext/fts3/fts3_porter.c
index 27f9cf39d7535e4272017df2613f9aba4461f215..148c57008818b86d6bc7863370dc2f310cf9810e 100644 (file)
--- a/ext/fts3/fts3_porter.c
+++ b/ext/fts3/fts3_porter.c
@@ -22,9 +22,8 @@
 **     * The FTS3 module is being built into the core of
 **       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
 */
-#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
-
 #include "fts3Int.h"
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c
index 5ae3a16fc450bc676f806b828f9ddabdd960ad11..0da370c7ea6a5a533b30d7ec60fcae0399038c16 100644 (file)
--- a/ext/fts3/fts3_snippet.c
+++ b/ext/fts3/fts3_snippet.c
@@ -11,9 +11,9 @@
 ******************************************************************************
 */
 
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
-#include "fts3Int.h"
 #include <string.h>
 #include <assert.h>
 

diff --git a/ext/fts3/fts3_term.c b/ext/fts3/fts3_term.c
index eff65b7bd1524af0e2d16d30c0a0c20932242312..da9bf4543bc8082c0c0ca00ff244776a2ac3ee70 100644 (file)
--- a/ext/fts3/fts3_term.c
+++ b/ext/fts3/fts3_term.c
@@ -15,10 +15,10 @@
 ** access to the full-text index of an FTS table. 
 */
 
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 #ifdef SQLITE_TEST
 
-#include "fts3Int.h"
 #include <string.h>
 #include <assert.h>
 

diff --git a/ext/fts3/fts3_tokenizer.c b/ext/fts3/fts3_tokenizer.c
index aa28933439cea86d5a722f2537d08226f608a11b..87a9a3d430977719b26e599aa1b46f246a705cc9 100644 (file)
--- a/ext/fts3/fts3_tokenizer.c
+++ b/ext/fts3/fts3_tokenizer.c
@@ -23,14 +23,14 @@
 **     * The FTS3 module is being built into the core of
 **       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
 */
-#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
-
 #include "sqlite3ext.h"
 #ifndef SQLITE_CORE
   SQLITE_EXTENSION_INIT1
 #endif
-
 #include "fts3Int.h"
+
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
+
 #include <assert.h>
 #include <string.h>
 

diff --git a/ext/fts3/fts3_tokenizer1.c b/ext/fts3/fts3_tokenizer1.c
index 432c35d1a2518065965ec918afac208c4cd776dd..d11a499766ee6f4d0d2a6fe94c1719408763657d 100644 (file)
--- a/ext/fts3/fts3_tokenizer1.c
+++ b/ext/fts3/fts3_tokenizer1.c
@@ -22,9 +22,8 @@
 **     * The FTS3 module is being built into the core of
 **       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
 */
-#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
-
 #include "fts3Int.h"
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 0d1e6ba21da6e9c01edd3cd655d5d61e784b7b54..ea59e6eb625489ff619f2e98a53982cc974bc2d9 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -17,9 +17,9 @@
 ** code in fts3.c.
 */
 
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 
-#include "fts3Int.h"
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>

diff --git a/manifest b/manifest
index fa4aff42a928c0a15b7e866862c9310262d78459..d847584939fb10d678f184bca8b4474dfe74ee1a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\smultiplex.test\smodule\sso\sthat\sit\sworks\swith\sthe\sinmemory_journal\npermutation.
-D 2011-06-15T23:34:51.929
+C Changes\sto\s#ifdefs\sso\sthat\sthe\sbuild\sgoes\scorrectly\sif\sthe\sonly\sFTS\smacro\ndefined\sis\sSQLITE_ENABLE_FTS4.
+D 2011-06-16T00:54:45.816
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -61,22 +61,22 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 6c7b588761082e3c5452fbff02c8a2004875ea26
+F ext/fts3/fts3.c 014e06f585f7ff0e34229a8eb7955ae03b8086fe
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h a999cfbf605efec293a88519f74192f5204c84d6
-F ext/fts3/fts3_aux.c baed9dab7fb4604ae8cafdb2d7700abe93beffbe
-F ext/fts3/fts3_expr.c b95f0d76bcf4507c73a838f3178c4ed8c42dc2bb
-F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
+F ext/fts3/fts3Int.h 27b0b75c4d50f4022eeacbd62801d8e204ae2584
+F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691
+F ext/fts3/fts3_expr.c 23791de01b3a5d313d76e02befd2601d4096bc2b
+F ext/fts3/fts3_hash.c aad95afa01cf2a5ffaa448e4b0ab043880cd1efb
 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
-F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295
-F ext/fts3/fts3_porter.c d61cfd81fb0fd8fbcb25adcaee0ba671aefaa5c2
-F ext/fts3/fts3_snippet.c 82e2c1e420c871c02f6e85ea438570118d7105c8
-F ext/fts3/fts3_term.c 6c7f33ab732a2a0f281898685650e3a492e1e2f1
+F ext/fts3/fts3_icu.c 6c8f395cdf9e1e3afa7fadb7e523dbbf381c6dfa
+F ext/fts3/fts3_porter.c 8d946908f4812c005d3d33fcbe78418b1f4eb70c
+F ext/fts3/fts3_snippet.c a44b38a07d39701ab6d20d7d89fcafe193bf3680
+F ext/fts3/fts3_term.c 51e384269edcc015e8b555fdad2338f053388975
 F ext/fts3/fts3_test.c 4e833729c13cea9a6bb98d3b353f6e3b8f756004
-F ext/fts3/fts3_tokenizer.c 055f3dc7369585350b28db1ee0f3b214dca6724d
+F ext/fts3/fts3_tokenizer.c 90ba6cdd8bb1b3686ab7a3d72333131e13c8fdb2
 F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3
-F ext/fts3/fts3_tokenizer1.c 6e5cbaa588924ac578263a598e4fb9f5c9bb179d
-F ext/fts3/fts3_write.c 4c008450666d6a1f45ba404cf654ebdb3d4da4cd
+F ext/fts3/fts3_tokenizer1.c 0dde8f307b8045565cf63797ba9acfaff1c50c68
+F ext/fts3/fts3_write.c b0df39416b69e735c1209a2c1cd61bc3cd21c2c9
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@ -945,7 +945,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 177e2d72a8a654d25720e6afc7706624610ac80f
-R e264f27c78f465a3a7dd939a16ceb912
+P 03d9480fc4a8310bc8da81a64f9206c8f4b501d9
+R d0766e6b55a873753b193b31dc04f4d0
 U drh
-Z 199fa6f213cb3bfff11b26a0ef6f9d7c
+Z d9decbc0f2b53d6559c9602b3b81dc73

diff --git a/manifest.uuid b/manifest.uuid
index 1618bb323a8ab2c791c4aa32c705aa34c88db5a1..19f7afc0acf48d448a08dcb967c1e4997f38f8d9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03d9480fc4a8310bc8da81a64f9206c8f4b501d9
\ No newline at end of file
+a0b43a320e6491de7070966ed7c3ec55fd660a85
\ No newline at end of file