Update shell.c.in so that SQLITE_SHELL_IS_UTF8 is set to 0 if the -municode option...

FossilOrigin-Name: 99e6a0f020fadda4011e4ca370d2421dbf2f97f6fb004fcbba9bd6c76faf7a73

diff --git a/manifest b/manifest
index a4ab321f7ef6bbb64f594dc6bfb893a8ed3adc50..ffdc7177058118ec66ef0468f388db2895a985c8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sbranch\smade\sunreachable\sby\scheck-in\s[e893f88750ea64d4].
-D 2021-03-04T16:32:28.875
+C Update\sshell.c.in\sso\sthat\sSQLITE_SHELL_IS_UTF8\sis\sset\sto\s0\sif\sthe\s-municode\soption\sis\spassed\sto\sgcc\son\swindows.
+D 2021-03-04T18:31:07.199
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -543,7 +543,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 022aeaa3f3ef6faf76c48fffa97a7ec906606d175a1cd3dd5c186543fa7a1fa3
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c213c99cfb85cee59138c18969d656a206a5b7ef0f3a1734b4b617f3cda82f84
-F src/shell.c.in 844417f84df1f6c4fce1c815629a888cfdcf219e86513e9c332bbcc38832f477
+F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947
 F src/sqlite.h.in 8855a19f37ade8dad189a9e48233a2ebe1b46faf469c7eb0906a654e252dcc57
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
@@ -1909,7 +1909,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 9adf6e2469d18bc3bfc0c804cfcaa692e23ab6b3e13465dcfc51c4b111b05cb4
-R 24b35917dc0167d6daa4ac4ab0d8d79c
-U drh
-Z a5d338c9d3983240f488ab70afcfd421
+P 20d7dc120dc964a0236da719e4de22bff5110b95da396e2ac6790e9f6b667899
+R c493558e2c42471297f2d692670b7ff9
+U dan
+Z 86f3ac1e31f812b542c339af82b7fb29

diff --git a/manifest.uuid b/manifest.uuid
index edaadda71a200b7831b2a73ebd93d182ae79decc..80994a529cd482d98d56e136ed96cffaa756e5ce 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-20d7dc120dc964a0236da719e4de22bff5110b95da396e2ac6790e9f6b667899
\ No newline at end of file
+99e6a0f020fadda4011e4ca370d2421dbf2f97f6fb004fcbba9bd6c76faf7a73
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 03c4fd319ecbce46e7c99a38e5e1edb8d341226e..01d07bb7a937ae96928e3ce1eb10b45f84e5cc12 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10823,7 +10823,8 @@ static char *cmdline_option_value(int argc, char **argv, int i){
 }
 
 #ifndef SQLITE_SHELL_IS_UTF8
-#  if (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
+#  if (defined(_WIN32) || defined(WIN32)) \
+   && (defined(_MSC_VER) || (defined(UNICODE) && defined(__GNUC__)))
 #    define SQLITE_SHELL_IS_UTF8          (0)
 #  else
 #    define SQLITE_SHELL_IS_UTF8          (1)