Fix compilation issue seen with MSVC.

FossilOrigin-Name: 0dfe790d8118ff1bacc9e7c97d4f8ff9e5789f6cda8ec6fd981ea38b4da3905d

diff --git a/manifest b/manifest
index 306eb3b70f8d5da05f9cdaec55e800b350381645..184cdce6c66903d5c2de4a1af33204b9a164e586 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\s.class\sfile\sbuild\sdependencies\sfix\sin\sthe\sJNI\sbuild.
-D 2023-11-09T13:00:33.039
+C Fix\scompilation\sissue\sseen\swith\sMSVC.
+D 2023-11-09T17:28:31.730
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -725,7 +725,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a19daa26e95f7245106a31f288b2f50c72d1f2cc156703f04c8c91450e111515
-F src/shell.c.in 7312c571ebf518fc8927bbb5aeb4fa67e5b0dfb2adae4258dcd1ccae42c11e1f
+F src/shell.c.in 297625a1ba6ea1c08bc2ea1b838b646cad309b62bf08df0e379355629404f140
 F src/sqlite.h.in a0fce680a40fe81b13eae3749d001134d9fe0a43aecc09a8986520d5119acfcd
 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 19c4778f45261006368b2d9460350fed1e55fed314c8b3e1af34cd8c3c73b7d8
-R cd252fb625d9fc6706ab257c76ca795a
-U stephan
-Z de48d509d9df78c4a1c1c2968a76e682
+P 8cc32915165efd7c261f008bb6fa4cc6581ee7bd73ea5da47513742b9e6d34e4
+R 8854825d1f1736b898c17995440cc740
+U mistachkin
+Z 0431c54643f1f1f0b5b6ac8fca652889
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 922f6f0dc839b1b1f1f1fcfd0aa7725b88e8075b..1bd2f05fab4cbb61c90919c6a4b00ad1dd2be806 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8cc32915165efd7c261f008bb6fa4cc6581ee7bd73ea5da47513742b9e6d34e4
\ No newline at end of file
+0dfe790d8118ff1bacc9e7c97d4f8ff9e5789f6cda8ec6fd981ea38b4da3905d
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 8d201bbbdaed28649a8dd1fa69785eaaf6b45a30..0e0dbd36c76feeabb3e66d3879fb1f81de55b99d 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1311,7 +1311,11 @@ static void shellDtostr(
   char z[400];
   if( n<1 ) n = 1;
   if( n>350 ) n = 350;
+#if defined(_MSC_VER)
+  _snprintf(z, sizeof(z)-2, "%#+.*e", n, r);
+#else
   snprintf(z, sizeof(z)-1, "%#+.*e", n, r);
+#endif
   sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
 }