diff options
author | drh <drh@noemail.net> | 2011-02-25 03:25:07 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2011-02-25 03:25:07 +0000 |
commit | 30f776fadb00d02320bb0a097f49b09aa6e5906b (patch) | |
tree | 22ee8a9b826a32426d7b7a96cff8ddb1552e0245 /src/os_unix.c | |
parent | 7f0857c43721f7813dc7a060399bd8d4114a2e69 (diff) | |
download | sqlite-30f776fadb00d02320bb0a097f49b09aa6e5906b.tar.gz sqlite-30f776fadb00d02320bb0a097f49b09aa6e5906b.zip |
Comment out some code in os_unix.c that only runs on MacOSX with
SQLITE_ENABLE_LOCKING_STYLE.
FossilOrigin-Name: 4e50b0362ab6604a4b6c9f4ad849ec1733d6ce1a
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index edbf36f30..473432be5 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1349,6 +1349,11 @@ static int _posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){ ** 4: [RRRR.] */ if( eFileLock==SHARED_LOCK ){ + +#if !defined(__APPLE__) || !SQLITE_ENABLE_LOCKING_STYLE + assert( handleNFSUnlock==0 ); +#endif +#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE if( handleNFSUnlock ){ off_t divSize = SHARED_SIZE - 1; @@ -1388,7 +1393,9 @@ static int _posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){ } goto end_unlock; } - }else{ + }else +#endif /* defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE */ + { lock.l_type = F_RDLCK; lock.l_whence = SEEK_SET; lock.l_start = SHARED_FIRST; |