Merge trunk and an off-list patch from Jan N. into the cygwin-fixes branch.

FossilOrigin-Name: 38807d8bce50114fcaaa656bba0437fd3c3164c7051e9938a39c2791c8f4725b

diff --cc autosetup/sqlite-config.tcl
Simple merge

diff --cc manifest
index 88a57415efa3dbeee9178deae978be3b35598183,f6ec1075170eb601f6efb4f7f5bd7e1fe647ccc1..1ebb50524619eff85abe3c383b14d065e689f8d4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\sinto\sthe\scygwin-fixes\sbranch.\sIt\smerges\scleanly\sand\sbuilds\sfine\s(in\s27m2s)\sbut\smake\stest\shas\smany\sfailures\swhich\slook\sto\sbe\sWindowsisms,\srelated\sto\slocked\sand/or\smissing\sfiles.
- D 2025-10-09T18:37:49.383
 -C Back\sout\s[8bf26c956e].\sIt\sis\snot\srequired\sfollowing\s[8e7da8cf50].
 -D 2025-10-10T16:04:19.837
++C Merge\strunk\sand\san\soff-list\spatch\sfrom\sJan\sN.\sinto\sthe\scygwin-fixes\sbranch.
++D 2025-10-10T16:59:25.820
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -47,12 -47,12 +47,12 @@@ F autosetup/find_tclconfig.tcl e64886ff
  F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
  F autosetup/proj.tcl ec30c4bc301b6e9eb937655744a7315f863f804fc66400d975bcf9352ac96a1d
- F autosetup/sqlite-config.tcl fa1d26fd1cf7a5f5919449bfa69e41c52e52fd122ff792816c8714a2b00338cf
 -F autosetup/sqlite-config.tcl a616f2e33f1921a5bd7932312a88812a01f80af3d76250e479836e0e15ce9ee1
++F autosetup/sqlite-config.tcl 2e3c81148c78e0340544662bdb448b2ea02cc2acb6a93d4c00949b7a3c8a486e
  F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
- F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca w autoconf/tea/autosetup/README.txt
- F autosetup/teaish/core.tcl aee092fc71986d1272b835ea7492bb55ffc213a289502e4f14da80cf67b7e3c3 w autoconf/tea/autosetup/core.tcl
- F autosetup/teaish/feature.tcl 18194fb79a24d30e5bbdeab40999616f39278b53a27525349ded033af2fd73be w autoconf/tea/autosetup/feature-tests.tcl
- F autosetup/teaish/tester.tcl 1799514c2652db49561b3386c5242b94534d1663f2cfac861a955e071895fdd0 w autoconf/tea/autosetup/tester.tcl
+ F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca
+ F autosetup/teaish/core.tcl aee092fc71986d1272b835ea7492bb55ffc213a289502e4f14da80cf67b7e3c3
+ F autosetup/teaish/feature.tcl 18194fb79a24d30e5bbdeab40999616f39278b53a27525349ded033af2fd73be
+ F autosetup/teaish/tester.tcl 1799514c2652db49561b3386c5242b94534d1663f2cfac861a955e071895fdd0
  F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
  F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
@@@ -718,9 -718,9 +718,9 @@@ F src/os.c 509452169d5ea739723e213b8e24
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
- F src/os_setup.h 4a4c8ea1aaac1a8a79cb34b426c49cb5f97237134dbabbd98feb0742648b8a77
 -F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
 -F src/os_unix.c b3da55bc4bb214b2bfb1e430b10e9d3ebcf6b11741921ab044c9b9539c8fcc4f
 -F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
++F src/os_setup.h b526af209201988782226983ecbaecc24caad2c657357c24b2fb5d346078e26d
 +F src/os_unix.c 42cddd1d6e6e4963b369930356dc9cb8c1d7c8f6c027130f84e7d05e74f34d94
 +F src/os_win.c 10e6b13041be4529dc22de1e1dbcb0eccf25dd15dd4ea3bf6f3b05e4a4a4da55
  F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
  F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764
  F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
@@@ -2169,8 -2169,8 +2169,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 7471088197e647d5fc9eded332cc2ae35bb38fa8c62f948057e1ab89ed25bb42 bb13e46ddfcd1d3ca73845430d9a91c0ea3913762d39bbd94127783d77e4f63b
- R 13112b95b11b7b8d32db49b2a3213916
 -P 4966d7a1ce42af8b1c50fdd40e651e80d0eeb8cb62dd882950cab275f98aba88
 -R b942099604595f11d845c663da1ef706
 -U dan
 -Z 13a143275403dfceaee76597c8ba1588
++P 5ca248f96d26778c863ffc65e3263084b10a70494548f640c81de2057cd09f1f ea29180797aa4bb25180432e75a372277a6f6e2262906a9e765a3bddf8ca79d7
++R 475d8dccf0a393275dd581eee60c1ca2
 +U stephan
- Z 84ad281716be9a7a0437cd63787f07b3
++Z 119f796f65476eefad0b2c385c690ee2
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 6f73794415fa743ac212243874fab8968417e338,f1f1f83ab9945a6fb96ca89d2d91c4846bf2e4e7..b82e95be5da7c324f58b936c962ce89f5e1243b2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5ca248f96d26778c863ffc65e3263084b10a70494548f640c81de2057cd09f1f
 -ea29180797aa4bb25180432e75a372277a6f6e2262906a9e765a3bddf8ca79d7
++38807d8bce50114fcaaa656bba0437fd3c3164c7051e9938a39c2791c8f4725b

diff --cc src/os_setup.h
index 16527355e098346bab7d7055e67b0e6edaf1d823,2aa4b26b3397436a201bc461509193035b005050..18bd76788db4f82922519270148ee103ffeda3fc
--- 1/src/os_setup.h
--- 2/src/os_setup.h
+++ b/src/os_setup.h
@@@ -79,20 -75,16 +79,20 @@@
  #  define SQLITE_OS_KV 0
  #  undef SQLITE_OS_OTHER
  #  define SQLITE_OS_OTHER 0
- #  if !defined(__CYGWIN__)
++#  if !defined(__CYGWIN__) || !defined(SQLITE_OS_WIN)
  #  undef SQLITE_OS_WIN
  #  define SQLITE_OS_WIN 0
 +#  endif
  #endif
  #if SQLITE_OS_WIN+1>1
  #  undef SQLITE_OS_KV
  #  define SQLITE_OS_KV 0
  #  undef SQLITE_OS_OTHER
  #  define SQLITE_OS_OTHER 0
- #  if !defined(__CYGWIN__)
++#  if !defined(__CYGWIN__) || !defined(SQLITE_OS_WIN)
  #  undef SQLITE_OS_UNIX
  #  define SQLITE_OS_UNIX 0
 +#  endif
  #endif