diff options
| author | drh <drh@noemail.net> | 2011-04-15 14:33:20 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2011-04-15 14:33:20 +0000 |
| commit | d4a80312b82ecb61bbd40281e6872092a17274b7 (patch) | |
| tree | 421ca76389a1c772649c7e66b4bc92f786719545 /src | |
| parent | a21b83ba3bc3552c0dbd92fd5051533cda934718 (diff) | |
| download | sqlite-d4a80312b82ecb61bbd40281e6872092a17274b7.tar.gz sqlite-d4a80312b82ecb61bbd40281e6872092a17274b7.zip | |
Fix #ifs involving SQLITE_ENABLE_LOCKING_STYLE so that they check the value of
that macro and not whether it is defined.
FossilOrigin-Name: 8775f159c129e1ee36a1a13c362184713376bd40
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 905b3cd23..48613b420 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -330,7 +330,7 @@ static struct unix_syscall { { "read", (sqlite3_syscall_ptr)read, 0 }, #define osRead ((ssize_t(*)(int,void*,size_t))aSyscall[8].pCurrent) -#if defined(USE_PREAD) || defined(SQLITE_ENABLE_LOCKING_STYLE) +#if defined(USE_PREAD) || SQLITE_ENABLE_LOCKING_STYLE { "pread", (sqlite3_syscall_ptr)pread, 0 }, #else { "pread", (sqlite3_syscall_ptr)0, 0 }, @@ -347,7 +347,7 @@ static struct unix_syscall { { "write", (sqlite3_syscall_ptr)write, 0 }, #define osWrite ((ssize_t(*)(int,const void*,size_t))aSyscall[11].pCurrent) -#if defined(USE_PREAD) || defined(SQLITE_ENABLE_LOCKING_STYLE) +#if defined(USE_PREAD) || SQLITE_ENABLE_LOCKING_STYLE { "pwrite", (sqlite3_syscall_ptr)pwrite, 0 }, #else { "pwrite", (sqlite3_syscall_ptr)0, 0 }, @@ -933,7 +933,7 @@ struct unixInodeInfo { UnixUnusedFd *pUnused; /* Unused file descriptors to close */ unixInodeInfo *pNext; /* List of all unixInodeInfo objects */ unixInodeInfo *pPrev; /* .... doubly linked */ -#if defined(SQLITE_ENABLE_LOCKING_STYLE) +#if SQLITE_ENABLE_LOCKING_STYLE unsigned long long sharedByte; /* for AFP simulated shared lock */ #endif #if OS_VXWORKS |