/ Check-in [f9c49ba1]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f9c49ba1edf13cb8c48d73f1b2e3f80c46b3c030
User & Date: dan 2016-02-19 10:18:36
References
2016-02-19
10:19
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]. check-in: ce0f1ed5 user: dan tags: branch-3.11-matchinfo
Context
2016-02-19
13:19
Omit the unused yyzerominor constant. check-in: 60ad68a9 user: drh tags: trunk
10:19
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]. check-in: ce0f1ed5 user: dan tags: branch-3.11-matchinfo
10:18
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. check-in: f9c49ba1 user: dan tags: trunk
00:48
Further improvements to the MSVC batch build tool. check-in: b9626b59 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts5/fts5_test_mi.c.

    44     44   #ifdef SQLITE_ENABLE_FTS5
    45     45   
    46     46   #include "fts5.h"
    47     47   #include <assert.h>
    48     48   #include <string.h>
    49     49   
    50     50   typedef struct Fts5MatchinfoCtx Fts5MatchinfoCtx;
           51  +
           52  +#ifndef SQLITE_AMALGAMATION
    51     53   typedef unsigned int u32;
           54  +#endif
    52     55   
    53     56   struct Fts5MatchinfoCtx {
    54     57     int nCol;                       /* Number of cols in FTS5 table */
    55     58     int nPhrase;                    /* Number of phrases in FTS5 query */
    56     59     char *zArg;                     /* nul-term'd copy of 2nd arg */
    57     60     int nRet;                       /* Number of elements in aRet[] */
    58     61     u32 *aRet;                      /* Array of 32-bit unsigned ints to return */