From: drh <> Date: Sat, 7 Mar 2026 12:00:56 +0000 (+0000) Subject: An attempt to get the CLI build to work with mingw32. X-Git-Tag: major-release~107 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cde22e88065f4016e2de32534ab1b46b0617fb75;p=thirdparty%2Fsqlite.git An attempt to get the CLI build to work with mingw32. [forum:/forumpost/086cb1ef66|Forum post 086cb1ef66]. FossilOrigin-Name: d95b9e7c1746b9cbd067aa65806b1f74d0dfe77ab6084cb3da9ef2242cac9134 --- diff --git a/manifest b/manifest index 4790d7f179..80db6ffee4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sanother\smemory\sleak\sfollowing\sOOM\sin\sthe\sdecimal\sextension. -D 2026-03-07T11:23:11.290 +C An\sattempt\sto\sget\sthe\sCLI\sbuild\sto\swork\swith\smingw32.\n[forum:/forumpost/086cb1ef66|Forum\spost\s086cb1ef66]. +D 2026-03-07T12:00:56.357 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -730,7 +730,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576 -F src/shell.c.in 1845b4c2028b6a264ec994628ac34b36c35eefbe61d6fb6a0370643f0e458aa9 +F src/shell.c.in d74e8b78bbbf0297e427c7e76abdbfb2769d5e9d67fec69806b1812c56316d8c F src/sqlite.h.in 307c7c1d1a71071b8572e8c6943f7a2e9483b008afb375758871881366f33e59 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca @@ -2189,8 +2189,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P d800ea06d231957cf571327d9eaf81564d5439aeee099987101050a41f9676c0 -R 9eaddb6689944d3172f39000a66b14ba +P 414f6dbc09c2a3cf04ccdfd8f11eecb7ef781facff979ae4236a452913001391 +R fb5997ea5564a7223207fc543e841a6b U drh -Z 7cd74c4c551cb8d08a9f4d015d3c61ad +Z 2f19e76929c8a5d942993c71d8f7951f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 59faf6ecfa..042d9ede3c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -414f6dbc09c2a3cf04ccdfd8f11eecb7ef781facff979ae4236a452913001391 +d95b9e7c1746b9cbd067aa65806b1f74d0dfe77ab6084cb3da9ef2242cac9134 diff --git a/src/shell.c.in b/src/shell.c.in index e67879b8ec..a9dd158aff 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -12776,7 +12776,7 @@ static int vfstraceOut(const char *z, void *pArg){ ** UTF8, then invoke the traditional main() entry point which is ** renamed using a #define to utf8_main() . */ -#if defined(_WIN32) && !defined(main) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(main) # define main utf8_main /* Rename entry point to utf_main() */ int SQLITE_CDECL utf8_main(int,char**); /* Forward declaration */ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){