diff options
| author | danielk1977 <danielk1977@noemail.net> | 2006-01-23 07:52:37 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2006-01-23 07:52:37 +0000 |
| commit | a1686c9a3ba0bbd7df587fcf58ca04f08b8e485c (patch) | |
| tree | aa6b1d4871fc558242b5c4af32e78cfaa8b3e475 /src | |
| parent | 4b202ae2a5b65ed12ef436b10e5fd3eaaa4252fb (diff) | |
| download | sqlite-a1686c9a3ba0bbd7df587fcf58ca04f08b8e485c.tar.gz sqlite-a1686c9a3ba0bbd7df587fcf58ca04f08b8e485c.zip | |
Fixes for OMIT_UTF16 and OMIT_COMPOUND (CVS 2993)
FossilOrigin-Name: f58bbdc0ac6e618686c598aaafb3a41b972e078e
Diffstat (limited to 'src')
| -rw-r--r-- | src/test1.c | 4 | ||||
| -rw-r--r-- | src/vdbeapi.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/test1.c b/src/test1.c index c563be849..af22b72ba 100644 --- a/src/test1.c +++ b/src/test1.c @@ -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.201 2006/01/20 15:45:36 drh Exp $ +** $Id: test1.c,v 1.202 2006/01/23 07:52:38 danielk1977 Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -578,9 +578,11 @@ static void countStep(sqlite3_context *context, int argc, sqlite3_value **argv){ int v = sqlite3_value_int(argv[0]); if( v==40 ){ sqlite3_result_error(context, "value of 40 handed to x_count", -1); +#ifndef SQLITE_OMIT_UTF16 }else if( v==41 ){ const char zUtf16ErrMsg[] = { 0, 0x61, 0, 0x62, 0, 0x63, 0, 0, 0}; sqlite3_result_error16(context, &zUtf16ErrMsg[1-SQLITE_BIGENDIAN], -1); +#endif } } } diff --git a/src/vdbeapi.c b/src/vdbeapi.c index a8d76b26b..b9e0526c1 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -95,10 +95,12 @@ void sqlite3_result_error(sqlite3_context *pCtx, const char *z, int n){ pCtx->isError = 1; sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF8, SQLITE_TRANSIENT); } +#ifndef SQLITE_OMIT_UTF16 void sqlite3_result_error16(sqlite3_context *pCtx, const void *z, int n){ pCtx->isError = 1; sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16NATIVE, SQLITE_TRANSIENT); } +#endif void sqlite3_result_int(sqlite3_context *pCtx, int iVal){ sqlite3VdbeMemSetInt64(&pCtx->s, (i64)iVal); } |