Avoid duplicate WIN32_LEAN_AND_MEAN #define. Fix a trivial nit likely never observed.

FossilOrigin-Name: 81ffcf41d69ae73ee8c037f675e18e2b46a15bee34062914640456381262d6fc

diff --git a/manifest b/manifest
index 05b37d07e9523f2ece432cdbc6912d95a2ce263b..5f785c29d99b93d1cc5d194f0628795b43ff8060 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sa\sfloating-point\sRTREE\sis\spresented\swith\slarge\sinteger\sconstraints\s-\s\nintegers\sthat\sare\stoo\sbig\sto\sbe\srepresented\sexactly\sby\sa\sfloat\s-\sthen\stake\nextra\ssteps\sto\sensure\sthat\sall\spossibly\srelevant\sentries\sin\sthe\sRTREE\sare\nreturned,\seven\sin\sboundary\scases.\s\sFix\sfor\sthe\sproblem\sidentified\sby\n[forum:/forumpost/da70ee0d0d|forum\spost\sda70ee0d0d].
-D 2023-05-22T16:35:21.265
+C Avoid\sduplicate\sWIN32_LEAN_AND_MEAN\s#define.\sFix\sa\strivial\snit\slikely\snever\sobserved.
+D 2023-05-22T20:36:55.790
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -637,7 +637,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 0937f89a8a020833eaca73a8c9e7661bfbf9b52905520a77993b9ce683dfbccb
-F src/shell.c.in 2c8cc2a0b01daf00767b53bb073324e2a0ce50df6c01dc751389403100b9ef1d
+F src/shell.c.in 29357bf9001c4dd977c2ce6cf55dcedd82f539c17654d15cd779fe429ceb169d
 F src/sqlite.h.in 8e0265e42d7695d86a0b8c7de9979e6c29edc2c616fa5eea11b682a6af838c7c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2070,8 +2070,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 4891dbd938f4bfd345eaef01f2addea9512eaa98f860844c73abb907b6a8e0e8
-R ed1374de25fa501b0ccb77bcd8313770
-U drh
-Z e2f1ed41df27fe2b21731bc19aa8abb0
+P bfd8d9100015f3e3fb011698963d670bd89b64ec8a8ab931e0c6c3076b029377
+R 1e771a19b66491996651406ee047d9d7
+U larrybr
+Z fa857662d3cd9b6d924aab71947729ba
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0e282d44786b370c0150abb05ee294a502a5c5df..4bfaddadf1ad9521c583bce0c0521faf7552e956 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bfd8d9100015f3e3fb011698963d670bd89b64ec8a8ab931e0c6c3076b029377
\ No newline at end of file
+81ffcf41d69ae73ee8c037f675e18e2b46a15bee34062914640456381262d6fc
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 575cbde4c5ccc3a54d57a61b1a35e33c7660ebe6..8e9ccce7cc926bd67876fc9d728ea6b5b0b55702 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -228,6 +228,7 @@ typedef unsigned char u8;
 #if SQLITE_OS_WINRT
 #include <intrin.h>
 #endif
+#undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
@@ -6014,7 +6015,7 @@ static void tryToCloneData(
   if( rc ){
     utf8_printf(stderr, "Error %d: %s on [%s]\n",
             sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
-            zQuery);
+            zInsert);
     goto end_data_xfer;
   }
   for(k=0; k<2; k++){