From: drh <drh@noemail.net>
Date: Fri, 15 Apr 2011 14:33:20 +0000 (+0000)
Subject: Fix #ifs involving SQLITE_ENABLE_LOCKING_STYLE so that they check the value of
X-Git-Tag: version-3.7.7~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4a80312b82ecb61bbd40281e6872092a17274b7;p=thirdparty%2Fsqlite.git

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
---

diff --git a/manifest b/manifest
index 6461c9d8a1..47f9cd3672 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sunix\sbackend\sreturns\sSQLITE_FULL\sif\swrite()\sfails\swith\san\nENOSPC\serror\scode.
-D 2011-04-15T12:36:10.750
+C Fix\s#ifs\sinvolving\sSQLITE_ENABLE_LOCKING_STYLE\sso\sthat\sthey\scheck\sthe\svalue\sof\nthat\smacro\sand\snot\swhether\sit\sis\sdefined.
+D 2011-04-15T14:33:20.351
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c dfe0ce8b089b2285bef0d6a987ec7d0d2ea9c825
+F src/os_unix.c c80e9d427c9c44c6a26f5233c14c14550e8c05c1
 F src/os_win.c 177a14a0690e072534749b5950034d0177bb26d6
 F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -929,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8332949c28ac72890de82b49bc11f02064b2647d
-R 47855d4bf67a20ac0aa325e3d7bd29c2
+P 721e3c16b389a43f5d7c47a8fd0294473a39dad2
+R 6f5e617a8c0cbf994cc700b206a09793
 U drh
-Z 9ee4ff13d3f59362e6b65781768e2aa1
+Z b45c080aa2b2ed31817e44bd868b491f
diff --git a/manifest.uuid b/manifest.uuid
index 172414c9fd..9637a30028 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-721e3c16b389a43f5d7c47a8fd0294473a39dad2
\ No newline at end of file
+8775f159c129e1ee36a1a13c362184713376bd40
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 905b3cd235..48613b420a 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