From: drh Date: Wed, 12 Jul 2017 12:19:33 +0000 (+0000) Subject: Compile cleanly with SQLITE_OMIT_UTF16. X-Git-Tag: version-3.20.0~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0f44b79c90682a35621baad331468443dcf7134;p=thirdparty%2Fsqlite.git Compile cleanly with SQLITE_OMIT_UTF16. FossilOrigin-Name: 783100b801703577e35ec12fe7623e1797e49699f3b8deb0694ef061a142b844 --- diff --git a/manifest b/manifest index 0ae649bd1e..0c065d61a1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\slsm,\sattempt\sto\sunmap\sthe\sdatabase\sfile\sbefore\struncating\sit\swhen\ndisconnecting.\sA\smapped\sfile\smay\snot\sbe\struncated\son\swin32. -D 2017-07-11T20:36:35.268 +C Compile\scleanly\swith\sSQLITE_OMIT_UTF16. +D 2017-07-12T12:19:33.990 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba @@ -413,7 +413,7 @@ F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c bb70abf32c7c926745eb550938db9132309584a667a44c2db0e5fa3207600391 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e -F src/loadext.c 83fc9858b19ffe4b7191f5d0bfa9111896af9d7dff55367edc92e6720511108e +F src/loadext.c 15e458a122bccef49850cc1d6b69802040ea3f9022e564a125faf599354fe050 F src/main.c 20574bb9a0d7911efcd659ac252f2126dc4e3308bed3c8764ea3fb5a00f70420 F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 @@ -455,7 +455,7 @@ F src/shell.c.in 98bfdeeb0808418b37f59e6d380568a76e0733efe2494377096f434b39940ca F src/sqlite.h.in 03a422ba13da1dfef7f1aaa1ba344acf18dc867112620b1fdb2a1426cabba634 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 5539ec41f3d81890d626d5a845b08c82bd0e946ddc5c1c341144b700bc56101e -F src/sqliteInt.h c9cc829906fc9c95444c6c3b4a7dbf8eac39af15cde5582e869ae5c9b4eebef9 +F src/sqliteInt.h 23e96647425bcda6afeeed945d1c706a8424098ba1c1d37976228ede0a60af53 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -514,12 +514,12 @@ F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db F src/treeview.c 2ee4a5dada213d5ab08a742af5c876cee6f1aaae65f10a61923f3fb63846afef F src/trigger.c d1cae560bfacc8bfb3a072d73658245c1714c0389097da69b4cb23877a082d7e F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc -F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c +F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5 F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23 F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf F src/vdbe.c adc8a378710ec2376101483cc8a5f499539ee9bbebfb2a784f3370704d5d44ad F src/vdbe.h dde459b1e8a02b8445ecfd5959f38cd5ebb6b0ad392d491d8b159ac8193d231a -F src/vdbeInt.h 8dd7548d86a98b77b6ed910d8014d0e9e0666356b56f3d16ab7063aad4f102f5 +F src/vdbeInt.h c8b3d97001a7bab5cdf71927fc813869d95263160e67ba2ef78a32d7538f159d F src/vdbeapi.c 899d8f021c89ab348708b3a9b00b855f5ecc3c0f949a75359a61a3c621021281 F src/vdbeaux.c 6f01fe8a49b801cc7734ccfc61d1b782131ee3bb7ee28e336f3c73474800f8f9 F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9 @@ -1631,7 +1631,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b0a49d90fc91acca1306cf6145adc83acd368686768b7eb4a3b27515b3237396 -R 02e2bf78e78459dd3983b787a92c6553 -U dan -Z 35b0c5fdca1937f85545a9243c607cf9 +P 39069941e98605bc8c7c736819781761760ee2b83363471ceb6f19e5eb06b13a +R 6c08473ae2deed66303e72a4ddd28537 +U drh +Z 1abdfc4df47c311bf1af13a17928c267 diff --git a/manifest.uuid b/manifest.uuid index 6f618d90a4..2cf2753188 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -39069941e98605bc8c7c736819781761760ee2b83363471ceb6f19e5eb06b13a \ No newline at end of file +783100b801703577e35ec12fe7623e1797e49699f3b8deb0694ef061a142b844 \ No newline at end of file diff --git a/src/loadext.c b/src/loadext.c index 47efc11f0c..b1f1b03e35 100644 --- a/src/loadext.c +++ b/src/loadext.c @@ -51,6 +51,7 @@ # define sqlite3_open16 0 # define sqlite3_prepare16 0 # define sqlite3_prepare16_v2 0 +# define sqlite3_prepare16_v3 0 # define sqlite3_result_error16 0 # define sqlite3_result_text16 0 # define sqlite3_result_text16be 0 diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 2e18b8cc93..5f7ad50cc4 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3925,7 +3925,9 @@ int sqlite3FixTriggerStep(DbFixer*, TriggerStep*); int sqlite3AtoF(const char *z, double*, int, u8); int sqlite3GetInt32(const char *, int*); int sqlite3Atoi(const char*); +#ifndef SQLITE_OMIT_UTF16 int sqlite3Utf16ByteLen(const void *pData, int nChar); +#endif int sqlite3Utf8CharLen(const char *pData, int nByte); u32 sqlite3Utf8Read(const u8**); LogEst sqlite3LogEst(u64); @@ -4014,7 +4016,9 @@ void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8, void sqlite3ValueSetNull(sqlite3_value*); void sqlite3ValueFree(sqlite3_value*); sqlite3_value *sqlite3ValueNew(sqlite3 *); +#ifndef SQLITE_OMIT_UTF16 char *sqlite3Utf16to8(sqlite3 *, const void*, int, u8); +#endif int sqlite3ValueFromExpr(sqlite3 *, Expr *, u8, u8, sqlite3_value **); void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8); #ifndef SQLITE_AMALGAMATION diff --git a/src/utf.c b/src/utf.c index 7801306cb4..4b04c9e282 100644 --- a/src/utf.c +++ b/src/utf.c @@ -332,7 +332,9 @@ translate_out: #endif return SQLITE_OK; } +#endif /* SQLITE_OMIT_UTF16 */ +#ifndef SQLITE_OMIT_UTF16 /* ** This routine checks for a byte-order mark at the beginning of the ** UTF-16 string stored in *pMem. If one is present, it is removed and diff --git a/src/vdbeInt.h b/src/vdbeInt.h index d8e899b0af..1789c83227 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -534,12 +534,14 @@ int sqlite3VdbeCheckFk(Vdbe *, int); # define sqlite3VdbeCheckFk(p,i) 0 #endif -int sqlite3VdbeMemTranslate(Mem*, u8); #ifdef SQLITE_DEBUG void sqlite3VdbePrintSql(Vdbe*); void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf); #endif -int sqlite3VdbeMemHandleBom(Mem *pMem); +#ifndef SQLITE_OMIT_UTF16 + int sqlite3VdbeMemTranslate(Mem*, u8); + int sqlite3VdbeMemHandleBom(Mem *pMem); +#endif #ifndef SQLITE_OMIT_INCRBLOB int sqlite3VdbeMemExpandBlob(Mem *);