Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove unnecessary lines from fts3.h and main.mk. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | fts5 |
| Files: | files | file ages | folders |
| SHA1: |
c1b268ced38259706674ed2fcbf842d3 |
| User & Date: | dan 2015-06-26 20:13:56 |
Context
|
2015-06-26
| ||
| 20:14 | Merge latest trunk with this branch. (Closed-Leaf check-in: 8671b9e1 user: dan tags: fts5) | |
| 20:13 | Remove unnecessary lines from fts3.h and main.mk. (check-in: c1b268ce user: dan tags: fts5) | |
| 20:08 | Fix a segfault that could follow an OOM error in fts5. (check-in: 713239b8 user: dan tags: fts5) | |
Changes
Changes to ext/fts3/fts3.h.
16 17 18 19 20 21 22 23 24 25 26 27 |
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3Fts3Init(sqlite3 *db);
int sqlite3Fts5Init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
|
< |
16 17 18 19 20 21 22 23 24 25 26 |
#include "sqlite3.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int sqlite3Fts3Init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
|
Changes to main.mk.
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 |
################################################################################
# This is how we compile
#
TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
TCCX += -I$(TOP)/ext/fts5
# Object files for the SQLite library.
#
LIBOBJ+= vdbe.o parse.o \
alter.o analyze.o attach.o auth.o \
backup.o bitvec.o btmutex.o btree.o build.o \
callback.o complete.o ctime.o date.o dbstat.o delete.o expr.o fault.o fkey.o \
|
< |
43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
################################################################################
# This is how we compile
#
TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
# Object files for the SQLite library.
#
LIBOBJ+= vdbe.o parse.o \
alter.o analyze.o attach.o auth.o \
backup.o bitvec.o btmutex.o btree.o build.o \
callback.o complete.o ctime.o date.o dbstat.o delete.o expr.o fault.o fkey.o \
|