From: larrybr <larrybr@noemail.net>
Date: Thu, 2 Nov 2023 11:04:37 +0000 (+0000)
Subject: CLI to compile with older MSVC compiler.
X-Git-Tag: version-3.45.0~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57a7fdd81487846e1e73074bdcc152a6c7dc85b0;p=thirdparty%2Fsqlite.git

CLI to compile with older MSVC compiler.

FossilOrigin-Name: c89f75f8eef449f6869bda423593f7e14080e805f8ed192aff9463460f11b1a9
---

diff --git a/manifest b/manifest
index e07f83e557..2076e838b1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\swindows\sbuild\sdocumentation\sto\sprovide\sthe\sexact\scommand\sused\nto\sbuild\sthe\sDLLs\sthat\sappear\son\sthe\sdownload\spage.
-D 2023-11-01T19:35:15.525
+C CLI\sto\scompile\swith\solder\sMSVC\scompiler.
+D 2023-11-02T11:04:37.702
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -722,7 +722,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a19daa26e95f7245106a31f288b2f50c72d1f2cc156703f04c8c91450e111515
-F src/shell.c.in 3e9371ca6a93294931a8ed8b098bc3cb15d57567aa9a1f2ade72db7f5c572795
+F src/shell.c.in aebfbedaa7706d2c73ab7366a19fc8bc40ea68b70d2529f7feef54e6eb077ea2
 F src/sqlite.h.in ef0e41e83ad1ac0dcc9ec9939bf541a44b1c5de821bee2d6c61754c3252f3276
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2139,8 +2139,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 c1ed7ed02269e5b26142eb307e7889fc636672f101ea7fc192a2445e16a7dd6f
-R 9f52bda73840b08593c0a2719141f789
-U drh
-Z 0993941d7491a4e53ffe83c0d4aa911d
+P 3524a8914c62f7987d948e5ef50cfdcb07254489e80e2257f38d0050c4baf450
+R 1426ab6e5bb9ef707c7806f924ffe51a
+U larrybr
+Z 3840fc65c1d88cda0ad731f26c553ff7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3178ed16a3..3c06af71c9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3524a8914c62f7987d948e5ef50cfdcb07254489e80e2257f38d0050c4baf450
\ No newline at end of file
+c89f75f8eef449f6869bda423593f7e14080e805f8ed192aff9463460f11b1a9
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index ad16d72044..3cfe1a94a4 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -704,9 +704,8 @@ static void console_prepare_utf8(void){
   conState.outCodePage = GetConsoleOutputCP();
   if( in_console ){
     SetConsoleCP(CP_UTF8);
-    DWORD newConsoleMode = conState.consoleMode
-      | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT;
-    SetConsoleMode(conState.hConsole, newConsoleMode);
+    SetConsoleMode(conState.hConsole, conState.consoleMode
+                   | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
     conState.infsMode = _setmode(_fileno(stdin), _O_U16TEXT);
     console_utf8_in = 1;
   }