database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00
Code Activity

Merge latest trunk changes with fts3-changes branch.

Browse Source 
FossilOrigin-Name: 226686475c28cdc87e86d2d3f10014436a9a2b8f
This commit is contained in:
dan
2011-06-28 09:51:22 +00:00
parent 90a80dc1b5 0ea2517c4e
commit b8ae1afba1
8 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/fts3/fts3Int.h
View File

@ -27,7 +27,14 @@
# define SQLITE_ENABLE_FTS3
#endif
#ifdef SQLITE_ENABLE_FTS3
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* If not building as part of the core, include sqlite3ext.h. */
#ifndef SQLITE_CORE
# include "sqlite3ext.h"
extern const sqlite3_api_routines *sqlite3_api;
#endif
#include "sqlite3.h"
#include "fts3_tokenizer.h"
#include "fts3_hash.h"
@ -510,5 +517,5 @@ int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr);
int sqlite3Fts3DeferredTokenList(Fts3DeferredToken *, char **, int *);
#endif /* SQLITE_ENABLE_FTS3 */
#endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */
#endif /* _FTSINT_H */

1
ext/fts3/fts3_hash.c
View File

@ -30,7 +30,6 @@
#include <stdlib.h>
#include <string.h>
#include "sqlite3.h"
#include "fts3_hash.h"
/*

3
ext/fts3/fts3_test.c
View File

@ -19,6 +19,8 @@
#include <string.h>
#include <assert.h>
#ifdef SQLITE_TEST
/* Required so that the "ifdef SQLITE_ENABLE_FTS3" below works */
#include "fts3Int.h"
@ -319,3 +321,4 @@ int Sqlitetestfts3_Init(Tcl_Interp *interp){
);
return TCL_OK;
}
#endif /* ifdef SQLITE_TEST */

5
ext/fts3/fts3_tokenizer.c
View File

@ -23,12 +23,7 @@
** * The FTS3 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#include "sqlite3ext.h"
#ifndef SQLITE_CORE
SQLITE_EXTENSION_INIT1
#endif
#include "fts3Int.h"
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
#include <assert.h>