Merge all the latests trunk enhancements into the win-dupe-crt-fio branch.

FossilOrigin-Name: 2d52db98f47fbcda0622c034b21c2fb19bf4345b88c5c565ae9e6f7128642e43

1 files changed, 4 insertions, 0 deletions

diff --git a/src/wal.c b/src/wal.c
index 4e49e707b..fd2eabfd9 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -3176,9 +3176,13 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int *pCnt){
   rc = walLockShared(pWal, WAL_READ_LOCK(mxI));
   walDisableBlocking(pWal);
   if( rc ){
+#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
     if( rc==SQLITE_BUSY_TIMEOUT ){
       *pCnt |= WAL_RETRY_BLOCKED_MASK;
     }
+#else
+    assert( rc!=SQLITE_BUSY_TIMEOUT );
+#endif
     assert( (rc&0xFF)!=SQLITE_BUSY||rc==SQLITE_BUSY||rc==SQLITE_BUSY_TIMEOUT );
     return (rc&0xFF)==SQLITE_BUSY ? WAL_RETRY : rc;
   }