mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add an "#ifndef SQLITE_AMALGAMATION" guard around a typedef in fts5_test_mi.c to avoid redefining "u32" if it is compiled as part of the amalgamation. Cherrypick of [f9c49ba1]. 

FossilOrigin-Name: ce0f1ed517e387ca6a687b805088d7c529cd257b
This commit is contained in:
dan 2016-02-19 10:19:43 +00:00
parent 557d0383ff
commit 9e2cfad18a
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/fts5/fts5_test_mi.c
View File

@ -48,7 +48,10 @@
#include <string.h>
typedef struct Fts5MatchinfoCtx Fts5MatchinfoCtx;
#ifndef SQLITE_AMALGAMATION
typedef unsigned int u32;
#endif
struct Fts5MatchinfoCtx {
int nCol; /* Number of cols in FTS5 table */

18
manifest
View File

@ -1,5 +1,5 @@
C Remove\sSQLITE_TEST\smacros\sfrom\sfts5_test_mi.c.\sAdd\sthe\sSQLITE_FTS5_ENABLE_TEST_MI\scompile\stime\ssymbol\s-\sto\smake\sit\seasier\sto\screate\sbuilds\sthat\sinclude\sthe\sfts5\smatchinfo\sdemo\sby\sdefault.
D 2016-02-18T16:16:43.028
C Add\san\s"#ifndef\sSQLITE_AMALGAMATION"\sguard\saround\sa\stypedef\sin\sfts5_test_mi.c\sto\savoid\sredefining\s"u32"\sif\sit\sis\scompiled\sas\spart\sof\sthe\samalgamation.\sCherrypick\sof\s[f9c49ba1].
D 2016-02-19T10:19:43.655
F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
@ -108,7 +108,7 @@ F ext/fts5/fts5_index.c c6cd5190c7e5dd94151cb17acd939c82e5c7be2d
F ext/fts5/fts5_main.c db24ac714c6c4a1b3c24a1f8c25889f2952148c1
F ext/fts5/fts5_storage.c f8343db90d8c95a4d4b52f6676e354b4649ffd6e
F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
F ext/fts5/fts5_test_mi.c 31a42dc3dcf1eb6127a0a1acf42ab4aa1d5e5c81
F ext/fts5/fts5_test_mi.c 6f76bfc2ec56ce258763c5ace7608636c8745956
F ext/fts5/fts5_test_tok.c db08af63673c3a7d39f053b36fd6e065017706be
F ext/fts5/fts5_tokenize.c 2ce7b44183538ec46b7907726262ee43ffdd39a8
F ext/fts5/fts5_unicode2.c b450b209b157d598f7b9df9f837afb75a14c24bf
@ -1427,12 +1427,8 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 3d862f207e3adc00f78066799ac5a8c282430a5f
Q +31d8b69e9e0747e573516570bfe2770384e99134
Q +87e6e225aea3a4d10476d16eab4a6403a4a128c9
R 484f9306b9fcc0db5560ffd225058ba6
T *branch * branch-3.11-matchinfo
T *sym-branch-3.11-matchinfo *
T -sym-trunk *
P e2ef6667772eeac6eee3aed5d0609c2a0ef5d8cf
Q +f9c49ba1edf13cb8c48d73f1b2e3f80c46b3c030
R 86861d7afb256ba49d3c7d2e1e2e6725
U dan
Z 3fda90a50bad45cca94156f3729f0ff4
Z 1618528e1896e183cb510df07cb30bf4

2
manifest.uuid
View File

@ -1 +1 @@
e2ef6667772eeac6eee3aed5d0609c2a0ef5d8cf
ce0f1ed517e387ca6a687b805088d7c529cd257b