From: drh <> Date: Tue, 2 Jun 2026 10:08:30 +0000 (+0000) Subject: Fix the CLI so that it works when compiled using STDCALL on X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b1637e5408d886e0505f7a5332e524ef290fd2b6;p=thirdparty%2Fsqlite.git Fix the CLI so that it works when compiled using STDCALL on Microsoft x86. Change should not affect other platforms. [forum:/info/2026-06-02T09:44:12Z|Forum 2026-06-02T09:44:12Z]. FossilOrigin-Name: 83adece349aed73b8d0a3aec141213ea329150eb529f4fd9774ca157b49d02fc --- diff --git a/manifest b/manifest index 2f06edebb2..5c614692ce 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sPRAGMA\sintegrity_check\sso\sthat\sit\sbetter\sdetects\sincorrect\nheader\ssizes\sat\sthe\sbeginning\sof\scells. -D 2026-06-01T20:02:17.368 +C Fix\sthe\sCLI\sso\sthat\sit\sworks\swhen\scompiled\susing\sSTDCALL\son\s\nMicrosoft\sx86.\s\sChange\sshould\snot\saffect\sother\splatforms.\n[forum:/info/2026-06-02T09:44:12Z|Forum\s2026-06-02T09:44:12Z]. +D 2026-06-02T10:08:30.009 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -738,7 +738,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c d0724113da9f5c0430d2052808ce59519f51ae7c4fbb1f5ef21fe3a832956086 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 5c3a5e3c1e6c3f8ccabeb414e18dce64e6f3e797de225ee93034f2c9e76f289c -F src/shell.c.in 82bf1b5cfa520d0c517c1c80629db6bfa311da3abf4d4e38a3519e1b7480790b +F src/shell.c.in a2da6feaab1614d45f6140528bf09e20186d4b0b865d83466f1c4826c394fefe F src/sqlite.h.in 749454ec71c875bc130d399ff9a7e47191d143d1b9d8b4af3839b6028df9eda9 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e @@ -2207,8 +2207,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 18ee3a17c589cfd34500b6a6547d0cb51aea4dd14b4e1e4b2d0cf0dbfb32378e -R 57e6f216e162542910b5a768f107b940 +P 08bb2878e7575ab069f8f132537880a47a4d4543a1ac8bffc55e32488223245c +R 7bda42de5c267b1c7c0f3e2216c5bba6 U drh -Z ef2d6ec9bd2f4a1da2b5b911804bcc4a +Z da9c927069104a7a040e82812bbdfdfa # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 43754294cb..244b45296e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -08bb2878e7575ab069f8f132537880a47a4d4543a1ac8bffc55e32488223245c +83adece349aed73b8d0a3aec141213ea329150eb529f4fd9774ca157b49d02fc diff --git a/src/shell.c.in b/src/shell.c.in index f9325767d7..bce2235a6a 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -13525,7 +13525,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){ /* ** The callback from atexit(). */ -static void abnormalExit(void){ +static void SQLITE_CDECL abnormalExit(void){ if( seenInterrupt ) eputz("Program interrupted.\n"); if( globalShellState ){ clearTempFile(globalShellState, 1, 1);