database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-21 13:38:01 +03:00
Code Activity

Macro tweaks to get SQLITE_OMIT_WAL building. Remove some nearby stray EOL whitespace.

Browse Source 
FossilOrigin-Name: c31a944680f18a799c763238dbb0561f8b039905ce442533258905219b33b743
This commit is contained in:
stephan
2025-10-30 18:38:14 +00:00
parent a8a99becb5
commit 916fc1129c
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os_unix.c
View File

@@ -1821,7 +1821,7 @@ static int unixFileLock(unixFile *pFile, struct flock *pLock){
}
}else{
#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
if( pFile->bBlockOnConnect && pLock->l_type==F_RDLCK
if( pFile->bBlockOnConnect && pLock->l_type==F_RDLCK
&& pLock->l_start==SHARED_FIRST && pLock->l_len==SHARED_SIZE
){
rc = osFcntl(pFile->h, F_SETLKW, pLock);
@@ -1832,8 +1832,12 @@ static int unixFileLock(unixFile *pFile, struct flock *pLock){
return rc;
}
#if !defined(SQLITE_WASI) && !defined(SQLITE_OMIT_WAL)
/* Forward reference */
static int unixIsSharingShmNode(unixFile*);
#else
#define unixIsSharingShmNode(pFile) (0)
#endif
/*
** Lock the file with the lock specified by parameter eFileLock - one
@@ -4777,7 +4781,7 @@ static int unixShmSystemLock(
}
#endif
return rc;
return rc;
}
/*
@@ -5266,7 +5270,7 @@ static int assertLockingArrayOk(unixShmNode *pShmNode){
return (memcmp(pShmNode->aLock, aLock, sizeof(aLock))==0);
#endif
}
#endif
#endif /* !defined(SQLITE_WASI) && !defined(SQLITE_OMIT_WAL) */
/*
** Change the lock state for a shared-memory segment.