mirror of https://github.com/sqlite/sqlite
Get the build working with -DSQLITE_OMIT_UTF16=1. Ticket #2314. (CVS 3865)
FossilOrigin-Name: 25c1c7aaa8ef203120c2c242cf72ce4750f78abd
This commit is contained in:
drh
parent
6ed34c59c5
commit
af30469d67
18
manifest
18
manifest
|
|
@ -1,5 +1,5 @@
|
|||
C Add\sthe\sability\sto\sturn\sthe\sFTS2\smodule\sinto\san\samalgamation.\s(CVS\s3864)
|
||||
D 2007-04-21T16:37:49
|
||||
C Get\sthe\sbuild\sworking\swith\s-DSQLITE_OMIT_UTF16=1.\s\sTicket\s#2314.\s(CVS\s3865)
|
||||
D 2007-04-23T23:56:31
|
||||
F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
|
||||
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
|
||||
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
|
||||
|
|
@ -73,7 +73,7 @@ F src/hash.c 67b23e14f0257b69a3e8aa663e4eeadc1a2b6fd5
|
|||
F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
|
||||
F src/insert.c 413cc06990cb3c401e64e596776c1e43934f8841
|
||||
F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
|
||||
F src/loadext.c 146fb9b9dc6133e763888d710205c32ebf8eeca2
|
||||
F src/loadext.c afe4f4755dc49c36ef505748bbdddecb9f1d02a2
|
||||
F src/main.c e6eb036c3580ba9116fedfe4a8b58ed63d5abb37
|
||||
F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
|
||||
F src/os.c 4650e98aadd27abfe1698ff58edf6893c58d4881
|
||||
|
|
@ -102,7 +102,7 @@ F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
|
|||
F src/sqliteInt.h 047af0e4c38bbb8652836f72adc9e9199c51a1ba
|
||||
F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
|
||||
F src/tclsqlite.c ec69eb9ad56d03fbf7570ca1ca5ea947d1ec4b6f
|
||||
F src/test1.c 3a7810d1ff8829268bd52a91c4f29d66f693e431
|
||||
F src/test1.c 53b7eb5cba0012f592b5860f6ad3b5a3f887eb1e
|
||||
F src/test2.c 24458b17ab2f3c90cbc1c8446bd7ffe69be62f88
|
||||
F src/test3.c 65f92247cf8592854e9bf5115b3fb711f8b33280
|
||||
F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
|
||||
|
|
@ -110,7 +110,7 @@ F src/test5.c 7162f8526affb771c4ed256826eee7bb9eca265f
|
|||
F src/test6.c 5957d249d437e4db74045ce2f1f661648d94bf94
|
||||
F src/test7.c 03fa8d787f6aebc6d1f72504d52f33013ad2c8e3
|
||||
F src/test8.c c3c4aeea4e3d70966306d6eca1b77ce7eee2f059
|
||||
F src/test9.c cb1a7b5a4a918bb0552fd0101fd3f88d85904cd2
|
||||
F src/test9.c c0f38f7795cc51d37db6c63874d90f40f10d0f0e
|
||||
F src/test_async.c 9d326ceda4306bcab252b8f7e8e480ed45d7ccb6
|
||||
F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436
|
||||
F src/test_hexio.c 32204b5ce281ebc85f789c69c4ec725129e7e7f5
|
||||
|
|
@ -282,7 +282,7 @@ F test/misc2.test d35faf7df27750d25ab656ca92dceebbd89f7368
|
|||
F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
|
||||
F test/misc4.test b043a05dea037cca5989f3ae09552fa16119bc80
|
||||
F test/misc5.test c7d2d2a5a20dc37d3605a8067f0df5af2240122e
|
||||
F test/misc6.test 3de55ec5cadf466ada587173faa5d6a4790a8bb7
|
||||
F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
|
||||
F test/misc7.test 292c9ec0245d3602e9d36555efa0a1a8c9df9c54
|
||||
F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
|
||||
F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
|
||||
|
|
@ -460,7 +460,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
|
|||
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
|
||||
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
|
||||
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
|
||||
P 9389a15f35f854c88440e365d85b48af3ff76b00
|
||||
R 2cbc78e0dd70ca0f7d6672765f8b0a98
|
||||
P 94374654ccabb391f5dcccfc88176ca677c5804e
|
||||
R d7b272e26c6d36664b64086fdb9d371b
|
||||
U drh
|
||||
Z 36d5b444e4309d5378f3e0773c4a5bc8
|
||||
Z baebe6d339241fecad908b7b83716212
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
94374654ccabb391f5dcccfc88176ca677c5804e
|
||||
25c1c7aaa8ef203120c2c242cf72ce4750f78abd
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
# define sqlite3_errmsg16 0
|
||||
# define sqlite3_open16 0
|
||||
# define sqlite3_prepare16 0
|
||||
# define sqlite3_prepare16_v2 0
|
||||
# define sqlite3_result_error16 0
|
||||
# define sqlite3_result_text16 0
|
||||
# define sqlite3_result_text16be 0
|
||||
|
|
@ -59,6 +60,9 @@
|
|||
# define sqlite3_value_text16 0
|
||||
# define sqlite3_value_text16be 0
|
||||
# define sqlite3_value_text16le 0
|
||||
# define sqlite3_column_database_name16 0
|
||||
# define sqlite3_column_table_name16 0
|
||||
# define sqlite3_column_origin_name16 0
|
||||
#endif
|
||||
|
||||
#ifdef SQLITE_OMIT_COMPLETE
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
** is not included in the SQLite library. It is used for automated
|
||||
** testing of the SQLite library.
|
||||
**
|
||||
** $Id: test1.c,v 1.238 2007/04/19 11:09:02 danielk1977 Exp $
|
||||
** $Id: test1.c,v 1.239 2007/04/23 23:56:31 drh Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include "tcl.h"
|
||||
|
|
@ -580,6 +580,7 @@ static void hex8Func(sqlite3_context *p, int argc, sqlite3_value **argv){
|
|||
zBuf[i*2] = 0;
|
||||
sqlite3_result_text(p, (char*)zBuf, -1, SQLITE_TRANSIENT);
|
||||
}
|
||||
#ifndef SQLITE_OMIT_UTF16
|
||||
static void hex16Func(sqlite3_context *p, int argc, sqlite3_value **argv){
|
||||
const unsigned short int *z;
|
||||
int i;
|
||||
|
|
@ -591,6 +592,7 @@ static void hex16Func(sqlite3_context *p, int argc, sqlite3_value **argv){
|
|||
zBuf[i*4] = 0;
|
||||
sqlite3_result_text(p, (char*)zBuf, -1, SQLITE_TRANSIENT);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
** A structure into which to accumulate text.
|
||||
|
|
@ -742,10 +744,12 @@ static int test_create_function(
|
|||
rc = sqlite3_create_function(db, "hex8", 1, SQLITE_ANY, 0,
|
||||
hex8Func, 0, 0);
|
||||
}
|
||||
#ifndef SQLITE_OMIT_UTF16
|
||||
if( rc==SQLITE_OK ){
|
||||
rc = sqlite3_create_function(db, "hex16", 1, SQLITE_ANY, 0,
|
||||
hex16Func, 0, 0);
|
||||
}
|
||||
#endif
|
||||
if( rc==SQLITE_OK ){
|
||||
rc = sqlite3_create_function(db, "tkt2213func", 1, SQLITE_ANY, 0,
|
||||
tkt2213Function, 0, 0);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
** for completeness. Test code is written in C for these cases
|
||||
** as there is not much point in binding to Tcl.
|
||||
**
|
||||
** $Id: test9.c,v 1.2 2007/03/29 17:28:15 danielk1977 Exp $
|
||||
** $Id: test9.c,v 1.3 2007/04/23 23:56:32 drh Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include "tcl.h"
|
||||
|
|
@ -132,11 +132,13 @@ static int c_misuse_test(
|
|||
}
|
||||
sqlite3_close(db);
|
||||
|
||||
#ifndef SQLITE_OMIT_UTF16
|
||||
rc = sqlite3_collation_needed16(db, 0, 0);
|
||||
if( rc!=SQLITE_MISUSE ){
|
||||
zErrFunction = "sqlite3_collation_needed16";
|
||||
goto error_out;
|
||||
}
|
||||
#endif
|
||||
|
||||
rc = sqlite3_collation_needed(db, 0, 0);
|
||||
if( rc!=SQLITE_MISUSE ){
|
||||
|
|
@ -168,11 +170,13 @@ static int c_misuse_test(
|
|||
goto error_out;
|
||||
}
|
||||
|
||||
#ifndef SQLITE_OMIT_UTF16
|
||||
rc = sqlite3_prepare16(db, 0, 0, 0, 0);
|
||||
if( rc!=SQLITE_MISUSE ){
|
||||
zErrFunction = "sqlite3_prepare16";
|
||||
goto error_out;
|
||||
}
|
||||
#endif
|
||||
|
||||
return TCL_OK;
|
||||
|
||||
|
|
@ -202,4 +206,3 @@ int Sqlitetest9_Init(Tcl_Interp *interp){
|
|||
}
|
||||
return TCL_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# This file implements tests to make sure sqlite3_value_text()
|
||||
# always returns a null-terminated string.
|
||||
#
|
||||
# $Id: misc6.test,v 1.2 2006/09/04 18:54:14 drh Exp $
|
||||
# $Id: misc6.test,v 1.3 2007/04/23 23:56:32 drh Exp $
|
||||
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
|
|
@ -30,6 +30,7 @@ do_test misc6-1.1 {
|
|||
do_test misc6-1.2 {
|
||||
sqlite3_column_text $STMT 0
|
||||
} {3031323334}
|
||||
ifcapable utf16 {
|
||||
do_test misc6-1.3 {
|
||||
sqlite3_finalize $STMT
|
||||
set STMT [sqlite3_prepare $DB {SELECT hex16(?)} -1 DUMMY]
|
||||
|
|
@ -41,6 +42,7 @@ do_test misc6-1.3 {
|
|||
do_test misc6-1.4 {
|
||||
sqlite3_column_text $STMT 0
|
||||
} {00300031003200330034}
|
||||
}
|
||||
sqlite3_finalize $STMT
|
||||
|
||||
finish_test
|
||||
|
|
|
|||
Loading…
Reference in New Issue