diff options
| author | drh <drh@noemail.net> | 2015-03-21 16:36:03 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-03-21 16:36:03 +0000 |
| commit | c435cf75a57292833696920189f416e923e4a85d (patch) | |
| tree | 6108e9ca848c396eacc435b7032cc26cede72ff6 /src/os_unix.c | |
| parent | b4e0fd26e3fad8124dd51a1ee1dc6e6286eff5a0 (diff) | |
| download | sqlite-c435cf75a57292833696920189f416e923e4a85d.tar.gz sqlite-c435cf75a57292833696920189f416e923e4a85d.zip | |
Fix the blocking WAL lock so that it works and so that it compiles on a Mac.
FossilOrigin-Name: 67d69d21de32816894be53e4b446656d4174eb0d
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 16cb935de..d0924a511 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3782,6 +3782,10 @@ static int unixGetTempname(int nBuf, char *zBuf); static int unixFileControl(sqlite3_file *id, int op, void *pArg){ unixFile *pFile = (unixFile*)id; switch( op ){ + case SQLITE_FCNTL_WAL_BLOCK: { + pFile->ctrlFlags |= UNIXFILE_BLOCK; + return SQLITE_OK; + } case SQLITE_FCNTL_LOCKSTATE: { *(int*)pArg = pFile->eFileLock; return SQLITE_OK; @@ -7228,10 +7232,6 @@ static int proxyTransformUnixFile(unixFile *pFile, const char *path) { */ static int proxyFileControl(sqlite3_file *id, int op, void *pArg){ switch( op ){ - case SQLITE_FCNTL_WAL_BLOCK: { - id->ctrlFlags |= UNIXFILE_BLOCK; - return SQLITE_OK; - } case SQLITE_FCNTL_GET_LOCKPROXYFILE: { unixFile *pFile = (unixFile*)id; if( pFile->pMethod == &proxyIoMethods ){ |