Improved detection of when the alternative windows-compatible main() is

needed in the sqldiff.exe utility.

FossilOrigin-Name: e25b849a603cb08ab888641ff324e9aa129391c4792de86a62c55e9caf84c16e

diff --git a/manifest b/manifest
index 36bcd8d310fe8d3c0b3d38f1d49334ced729123f..3429acff490667c5077a065917fe095649296063 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Relax\sarbitrary\slength\srestrictions\son\ssome\serror\smessages\sin\sthe\sCLI.
-D 2026-04-27T12:43:09.376
+C Improved\sdetection\sof\swhen\sthe\salternative\swindows-compatible\smain()\sis\nneeded\sin\sthe\ssqldiff.exe\sutility.
+D 2026-04-27T14:01:23.920
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -2182,7 +2182,7 @@ F tool/soak1.tcl a3892082ed1079671565c044e93b55c3c7f38829aedf53cc597c65d23ffdadd
 F tool/spaceanal.tcl 1f83962090a6b60e1d7bf92495d643e622bef9fe82ea3f2d22350dcbce9a12d0
 F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x
 F tool/split-sqlite3c.tcl 4969fd642dad0ea483e4e104163021d92baf98f6a8eac981fe48525f9b873430
-F tool/sqldiff.c 847edc1e0d1e1feb652d3d6128e504456deaf254ab9ad3e7cebd4317d2037182
+F tool/sqldiff.c de59a4eecbc802db8ad053889c10e6f8b8427b6f349199ee79938c92c20860dd
 F tool/sqlite3_analyzer.c.in 14f02cb5ec3c264cd6107d1f1dad77092b1cf440fc196c30b69ae87b56a1a43b
 F tool/sqlite3_rsync.c f510a8b230e1c5b0f62842acd0e94ff15d2f77a00ae782f7d20f9e39919fa19b
 F tool/sqltclsh.c.in c103c6fc7d42bce611f9d4596774d60b7ef3d0b291a1f58c9e6184e458b89296
@@ -2203,8 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 286fc22c7ca882b0b09de2f1b2a7e0b382af6c498f2f8ad237fe064feaa70d7f
-R 30f0f3c6a27cfb9f81c87a8f3fefc7f3
+P 52f5531ded8e0d3da3dc4d5c9b3d14573041b9446e2c45b5093c958b6c74e0de
+R b9bfbfbd5c347e44355e6f552d04b399
 U drh
-Z d429d5410c97065efc2bafc46e2e54eb
+Z ff3becbdb9364ef144f984a09b99f05c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d1333a70c6be4205e9e5d37455957083068cb708..80c7e5022dc5b57074bb32dbc8ca01dd6a977f05 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-52f5531ded8e0d3da3dc4d5c9b3d14573041b9446e2c45b5093c958b6c74e0de
+e25b849a603cb08ab888641ff324e9aa129391c4792de86a62c55e9caf84c16e

diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index d27a62e14e9bc9d399b22e4bc97516320dd35da6..01738c95233053e1a553d37faebdf9aa87714102 100644 (file)
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -1900,7 +1900,7 @@ static void showHelp(void){
 }
 
 /* work-around the Microsoft "WorstFit" bug */
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(main)
 #define main utf8_main
 #endif