Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix ticket #2439: the FTS1 and FTS2 extensions use the non-standard, unportable and highly deprecated <malloc.h> header on all platforms except Apple Mac OS X. The <malloc.h> actually is never required on any OS with an at least partly POSIX-conforming API as the malloc(3) & friends functions officially live in <stdlib.h> since over 10 years. Under some platform like FreeBSD the inclusion of <malloc.h> since a few years even causes an "#error" and this way a build failure. So, just get rid of the bad <malloc.h> usage in FTS1 and FTS2 extensions at all and stick with <stdlib.h> there only. (CVS 4191) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
3f9a666143a8aafa0b1a5d56ec68f69f |
| User & Date: | rse 2007-07-30 18:55:36 |
Context
|
2007-07-30
| ||
| 20:41 | Make excess output from the CLI appear inside SQL comments so as not to interfere with generated SQL. Ticket #2544. (CVS 4192) check-in: 49a2e855 user: drh tags: trunk | |
| 18:55 | Fix ticket #2439: the FTS1 and FTS2 extensions use the non-standard, unportable and highly deprecated <malloc.h> header on all platforms except Apple Mac OS X. The <malloc.h> actually is never required on any OS with an at least partly POSIX-conforming API as the malloc(3) & friends functions officially live in <stdlib.h> since over 10 years. Under some platform like FreeBSD the inclusion of <malloc.h> since a few years even causes an "#error" and this way a build failure. So, just get rid of the bad <malloc.h> usage in FTS1 and FTS2 extensions at all and stick with <stdlib.h> there only. (CVS 4191) check-in: 3f9a6661 user: rse tags: trunk | |
| 18:31 | "extern" declarations inside function bodies are not every compiler's favorite, so move to global scope. Additionally, at least under Unix environment use <unistd.h> to get the proper prototype instead of using a K&R-style own declaration. (CVS 4190) check-in: 5955a77d user: rse tags: trunk | |
Changes
Changes to ext/fts1/fts1.c.
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) #if defined(SQLITE_ENABLE_FTS1) && !defined(SQLITE_CORE) # define SQLITE_CORE 1 #endif #include <assert.h> #if !defined(__APPLE__) #include <malloc.h> #else #include <stdlib.h> #endif #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts1.h" #include "fts1_hash.h" #include "fts1_tokenizer.h" |
< < < < |
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) #if defined(SQLITE_ENABLE_FTS1) && !defined(SQLITE_CORE) # define SQLITE_CORE 1 #endif #include <assert.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts1.h" #include "fts1_hash.h" #include "fts1_tokenizer.h" |
Changes to ext/fts1/fts1_porter.c.
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
** * The FTS1 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS1 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) #include <assert.h> #if !defined(__APPLE__) #include <malloc.h> #else #include <stdlib.h> #endif #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts1_tokenizer.h" /* |
< < < < |
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
** * The FTS1 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS1 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) #include <assert.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts1_tokenizer.h" /* |
Changes to ext/fts1/fts1_tokenizer1.c.
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
** * The FTS1 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS1 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1) #include <assert.h> #if !defined(__APPLE__) #include <malloc.h> #else #include <stdlib.h> #endif #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts1_tokenizer.h" typedef struct simple_tokenizer { |
< < < < |
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
** * The FTS1 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS1 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS1)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts1_tokenizer.h"
typedef struct simple_tokenizer {
|
Changes to ext/fts2/fts2.c.
275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 |
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) #if defined(SQLITE_ENABLE_FTS2) && !defined(SQLITE_CORE) # define SQLITE_CORE 1 #endif #include <assert.h> #if !defined(__APPLE__) #include <malloc.h> #endif #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts2.h" #include "fts2_hash.h" |
< < < |
275 276 277 278 279 280 281 282 283 284 285 286 287 288 |
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) #if defined(SQLITE_ENABLE_FTS2) && !defined(SQLITE_CORE) # define SQLITE_CORE 1 #endif #include <assert.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts2.h" #include "fts2_hash.h" |
Changes to ext/fts2/fts2_porter.c.
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
** * The FTS2 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS2 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) #include <assert.h> #if !defined(__APPLE__) #include <malloc.h> #else #include <stdlib.h> #endif #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts2_tokenizer.h" /* |
< < < < |
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
** * The FTS2 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS2 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) #include <assert.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts2_tokenizer.h" /* |
Changes to ext/fts2/fts2_tokenizer1.c.
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
** * The FTS2 module is being built into the core of ** SQLite (in which case SQLITE_ENABLE_FTS2 is defined). */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2) #include <assert.h> #if !defined(__APPLE__) #include <malloc.h> #else #include <stdlib.h> #endif #include <stdio.h> #include <string.h> #include <ctype.h> #include "fts2_tokenizer.h" typedef struct simple_tokenizer { |
< < < < |
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
** * The FTS2 module is being built into the core of
** SQLite (in which case SQLITE_ENABLE_FTS2 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "fts2_tokenizer.h"
typedef struct simple_tokenizer {
|