1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Fix a couple of build problems.

FossilOrigin-Name: a5d5468c0509d129e198bf9432190ee07cedb7af
This commit is contained in:
dan
2015-03-04 08:29:24 +00:00
parent f400282bdf
commit 47c467c80e
13 changed files with 61 additions and 25 deletions

View File

@ -13,6 +13,7 @@
** This is an SQLite module implementing full-text search.
*/
#if defined(SQLITE_ENABLE_FTS5)
#include "fts5Int.h"
@ -1962,5 +1963,6 @@ int sqlite3Fts5Init(sqlite3 *db){
}
return rc;
}
#endif /* defined(SQLITE_ENABLE_FTS5) */

View File

@ -11,6 +11,8 @@
******************************************************************************
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
#include <math.h>
@ -549,5 +551,6 @@ int sqlite3Fts5AuxInit(fts5_api *pApi){
return rc;
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -12,6 +12,7 @@
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
@ -294,6 +295,5 @@ void *sqlite3Fts5MallocZero(int *pRc, int nByte){
}
return pRet;
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -13,6 +13,9 @@
** This is an SQLite module implementing full-text search.
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
#define FTS5_DEFAULT_PAGE_SIZE 1000
@ -789,3 +792,4 @@ int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
return rc;
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -12,6 +12,9 @@
**
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
#include "fts5parse.h"
@ -1695,3 +1698,4 @@ int sqlite3Fts5ExprPoslist(Fts5Expr *pExpr, int iPhrase, const u8 **pa){
return 0;
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -12,6 +12,9 @@
**
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
typedef struct Fts5HashEntry Fts5HashEntry;
@ -457,3 +460,4 @@ void sqlite3Fts5HashScanEntry(
}
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -16,6 +16,8 @@
** the interface defined in fts5Int.h.
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
/*
@ -448,8 +450,8 @@ struct Fts5MultiSegIter {
**
** FTS5_SEGITER_REVERSE:
** This flag is only ever set if FTS5_SEGITER_ONETERM is also set. If
** it is set, iterate through docids in ascending order instead of the
** default descending order.
** it is set, iterate through docids in descending order instead of the
** default ascending order.
**
** iRowidOffset/nRowidOffset/aRowidOffset:
** These are used if the FTS5_SEGITER_REVERSE flag is set.
@ -5060,3 +5062,4 @@ int sqlite3Fts5IndexInit(sqlite3 *db){
return rc;
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -12,6 +12,9 @@
**
*/
#ifdef SQLITE_ENABLE_FTS5
#include "fts5Int.h"
struct Fts5Storage {
@ -986,3 +989,4 @@ int sqlite3Fts5StorageConfigValue(
}
#endif /* SQLITE_ENABLE_FTS5 */

View File

@ -12,10 +12,13 @@
**
*/
#ifdef SQLITE_TEST
#include <tcl.h>
#ifdef SQLITE_ENABLE_FTS5
#include "fts5.h"
#include <tcl.h>
#include <string.h>
#include <assert.h>
@ -856,5 +859,9 @@ int Fts5tcl_Init(Tcl_Interp *interp){
return TCL_OK;
}
#endif
#else /* SQLITE_ENABLE_FTS5 */
int Fts5tcl_Init(Tcl_Interp *interp){
return TCL_OK;
}
#endif /* SQLITE_ENABLE_FTS5 */
#endif /* SQLITE_TEST */

View File

@ -11,6 +11,8 @@
******************************************************************************
*/
#if defined(SQLITE_ENABLE_FTS5)
#include "fts5.h"
#include <string.h>
#include <assert.h>
@ -1221,5 +1223,6 @@ int sqlite3Fts5TokenizerInit(fts5_api *pApi){
return SQLITE_OK;
}
#endif /* defined(SQLITE_ENABLE_FTS5) */