From: drh <> Date: Mon, 20 Feb 2023 16:55:58 +0000 (+0000) Subject: Fix an incorrect #ifdef in the CLI. X-Git-Tag: version-3.41.0~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffe9bfd8e9fe8a6402ae5a90f2ed75893c43b4e1;p=thirdparty%2Fsqlite.git Fix an incorrect #ifdef in the CLI. FossilOrigin-Name: 3c4d29cf227511bf218ef620d497dc72c708dcc819971b34c7629f3ed11803fb --- diff --git a/manifest b/manifest index 6b1e49ef00..9e4db46013 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\scompiler\swarning. -D 2023-02-19T19:16:51.589 +C Fix\san\sincorrect\s#ifdef\sin\sthe\sCLI. +D 2023-02-20T16:55:58.981 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -622,7 +622,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 5f6b393b7748a95d54d26e568e699cbe81bd8d6d39fddbf55fd6ec85afc4b7f8 -F src/shell.c.in 5cb750dc00bb8b20b020031fd1bb0cb8759a6e567c27aee6b0af31d187984985 +F src/shell.c.in 6f36f5ca05f1bebf74935a7fcf2dce983016e807a09cbd752a673583ad7da087 F src/sqlite.h.in 76159e46e7e1a8037131b07d86c945f59f87637f95cdae09f1d28e7cc950c43c F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4 @@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 655991f5d9afdd3281049eb430921046e0ba90eef215020c2fb149adc0d3c4c5 -R 2d810a0c2a1af010fb7d146538472f04 +P b2534d8de5051a3516f4b9ee5a4b99e1dcf455e9af88c60815d2c2a479fc8566 +R ab6cba252c112b4e7513f46d9e6246a1 U drh -Z f85648380fefb71aac040b10e003df7f +Z 29a401041348ce9abd7389765a1b9a77 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 50ee1464e9..79743a5d85 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b2534d8de5051a3516f4b9ee5a4b99e1dcf455e9af88c60815d2c2a479fc8566 \ No newline at end of file +3c4d29cf227511bf218ef620d497dc72c708dcc819971b34c7629f3ed11803fb \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 846569321b..de3b6a73bf 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -6138,7 +6138,7 @@ static int db_int(sqlite3 *db, const char *zSql){ return res; } -#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) +#if defined(SQLITE_SHELL_HAVE_RECOVER) /* ** Convert a 2-byte or 4-byte big-endian integer into a native integer */