/ Check-in [62ede669]
Login

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

Overview
Comment:Minor fixes to FTS3 so that it works better when appended to the end of the amalgamation. (CVS 4769)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 62ede6699d8f116921a5a0baddca5e7e63740cd3
User & Date: drh 2008-02-01 15:34:10
Context
2008-02-01
19:42
fix broken OS/2 mutex implementation (Ticket #2905) (CVS 4770) check-in: 05afd86e user: pweilbacher tags: trunk
15:34
Minor fixes to FTS3 so that it works better when appended to the end of the amalgamation. (CVS 4769) check-in: 62ede669 user: drh tags: trunk
13:44
Fix the build scripts for windows binaries. ticket #2916. (CVS 4768) check-in: c336b231 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

   284    284   #include <string.h>
   285    285   #include <ctype.h>
   286    286   
   287    287   #include "fts3.h"
   288    288   #include "fts3_hash.h"
   289    289   #include "fts3_tokenizer.h"
   290    290   #ifndef SQLITE_CORE 
   291         -  #include "sqlite3ext.h"
          291  +# include "sqlite3ext.h"
   292    292     SQLITE_EXTENSION_INIT1
   293    293   #endif
   294    294   
   295    295   
   296    296   /* TODO(shess) MAN, this thing needs some refactoring.  At minimum, it
   297    297   ** would be nice to order the file better, perhaps something along the
   298    298   ** lines of:

Changes to ext/fts3/fts3_tokenizer.c.

    22     22   **
    23     23   **     * The FTS3 module is being built into the core of
    24     24   **       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
    25     25   */
    26     26   #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
    27     27   
    28     28   #include "sqlite3ext.h"
    29         -SQLITE_EXTENSION_INIT1
           29  +#ifndef SQLITE_CORE
           30  +  SQLITE_EXTENSION_INIT1
           31  +#endif
    30     32   
    31     33   #include "fts3_hash.h"
    32     34   #include "fts3_tokenizer.h"
    33     35   #include <assert.h>
    34     36   
    35     37   /*
    36     38   ** Implementation of the SQL scalar function for accessing the underlying