From: drh <> Date: Tue, 14 Apr 2026 18:06:41 +0000 (+0000) Subject: Check-in [495e4851d4296b49] breaks the build for Windows. Fixed here. X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=57ed7f322f878377d4489d6218104f8e270b194e;p=thirdparty%2Fsqlite.git Check-in [495e4851d4296b49] breaks the build for Windows. Fixed here. FossilOrigin-Name: 5b004348c3ec15a02dd657b3619502b6f8ba1c6f46918108b3de9534622076a0 --- diff --git a/manifest b/manifest index baa598932a..12b8179713 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sREADME\stypo\sfix\sreported\soff-list\sby\sBrickViking. -D 2026-04-14T02:09:43.838 +C Check-in\s[495e4851d4296b49]\sbreaks\sthe\sbuild\sfor\sWindows.\s\sFixed\shere. +D 2026-04-14T18:06:41.509 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -735,7 +735,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 ae5a629eb8249ab5d5b61271a05e2c55b1b060794f44c5d41482dca3fb134a0c +F src/shell.c.in ed8e5819501faf4c390bb3db13931d3d75b8bff3deb31c952bbba14f4dbe4b16 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e @@ -2198,8 +2198,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P a6c2d7ce84f4f5f8a82cc566a27f98f5418f251e87f1f264ae57935fb10399f7 -R c5e9644977053976d7f63b6d59280f7b -U stephan -Z 9794e2a19f35a12deedc87498af940bf +P aa3432af90b2b9ab0b92f56a8e9c926930b9859e986500bd00d5600c1dd036bf +R 1fe24f779b0bd589c28180efb499a161 +U drh +Z f3928a2dde1f65cfcdc7de9df306f3dd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 495784c43d..795f279855 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -aa3432af90b2b9ab0b92f56a8e9c926930b9859e986500bd00d5600c1dd036bf +5b004348c3ec15a02dd657b3619502b6f8ba1c6f46918108b3de9534622076a0 diff --git a/src/shell.c.in b/src/shell.c.in index 17bd59be7e..76d22b5662 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -10681,8 +10681,13 @@ static int do_meta_command(const char *zLine, ShellState *p){ if( z[0]=='-' && !noOpt ){ if( z[1]=='-' ) z++; if( strcmp(z,"-hard-reset")==0 ){ +#ifdef _WIN32 + _putenv("SQLITE_PS1="); + _putenv("SQLITE_PS2="); +#else unsetenv("SQLITE_PS1"); unsetenv("SQLITE_PS2"); +#endif z += 5; } if( strcmp(z,"-reset")==0 ){