If compiling FTS3 in the amalgamation, include the ctype.h header file.
Ticket #3843. (CVS 6618) FossilOrigin-Name: 660108ef7a3c45f735789ba1039be2c37a8b0d0e
This commit is contained in:
parent
dff6c173dd
commit
79f02cef78
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Change\sthe\ssqlite3_create_function()\sfamily\sof\sroutines\sto\sreturn\nSQLITE_MISUSE\sinstead\sof\sSQLITE_ERROR\sif\stheir\sparameters\sare\sincorrect.\s(CVS\s6617)
|
||||
D 2009-05-07T13:43:49
|
||||
C If\scompiling\sFTS3\sin\sthe\samalgamation,\sinclude\sthe\sctype.h\sheader\sfile.\r\nTicket\s#3843.\s(CVS\s6618)
|
||||
D 2009-05-07T14:11:52
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -162,7 +162,7 @@ F src/select.c 9587023e906afe2074a718d25d6a4326874fb791
|
||||
F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
|
||||
F src/sqlite.h.in 926985a312747e284c21ab32a8e8231a3bed9bd1
|
||||
F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
|
||||
F src/sqliteInt.h 1f58ab9dee0c5b752ebad9c9d7932487430d0b04
|
||||
F src/sqliteInt.h 04607d0bee31fdbebf133cf6c764cfc3b447e340
|
||||
F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
|
||||
F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
|
||||
F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
|
||||
@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P 4a86de35d57a0c8720772c29431c86cd9be1fb9b
|
||||
R b61ac87edee6b8ff3347fa8f0c7bf800
|
||||
P 866f13e28c6fdb98947e1c7a89b7855bb5bbdb96
|
||||
R ea5f1ddf9c87b3e0617c4519f441bd08
|
||||
U drh
|
||||
Z 2f0cc6606171479d0e8b1fae806b15ae
|
||||
Z f7e6d912c673aa38e850b4f308f5d7fa
|
||||
|
@ -1 +1 @@
|
||||
866f13e28c6fdb98947e1c7a89b7855bb5bbdb96
|
||||
660108ef7a3c45f735789ba1039be2c37a8b0d0e
|
@ -11,7 +11,7 @@
|
||||
*************************************************************************
|
||||
** Internal interface definitions for SQLite.
|
||||
**
|
||||
** @(#) $Id: sqliteInt.h,v 1.868 2009/05/04 11:42:30 danielk1977 Exp $
|
||||
** @(#) $Id: sqliteInt.h,v 1.869 2009/05/07 14:11:52 drh Exp $
|
||||
*/
|
||||
#ifndef _SQLITEINT_H_
|
||||
#define _SQLITEINT_H_
|
||||
@ -2267,6 +2267,15 @@ int sqlite3WalkSelectFrom(Walker*, Select*);
|
||||
# define SQLITE_CORRUPT_BKPT SQLITE_CORRUPT
|
||||
#endif
|
||||
|
||||
/*
|
||||
** The ctype.h header is needed for non-ASCII systems. It is also
|
||||
** needed by FTS3 when FTS3 is included in the amalgamation.
|
||||
*/
|
||||
#if !defined(SQLITE_ASCII) || \
|
||||
(defined(SQLITE_ENABLE_FTS3) && defined(SQLITE_AMALGAMATION))
|
||||
# include <ctype.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
** The following macros mimic the standard library functions toupper(),
|
||||
** isspace(), isalnum(), isdigit() and isxdigit(), respectively. The
|
||||
@ -2281,7 +2290,6 @@ int sqlite3WalkSelectFrom(Walker*, Select*);
|
||||
# define sqlite3Isxdigit(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x08)
|
||||
# define sqlite3Tolower(x) (sqlite3UpperToLower[(unsigned char)(x)])
|
||||
#else
|
||||
# include <ctype.h>
|
||||
# define sqlite3Toupper(x) toupper((unsigned char)(x))
|
||||
# define sqlite3Isspace(x) isspace((unsigned char)(x))
|
||||
# define sqlite3Isalnum(x) isalnum((unsigned char)(x))
|
||||
|
Loading…
Reference in New Issue
Block a user