Make sure the threadsOverrideEachOthersLocks variable is only referenced by

linux systems on a threadsafe compile.

FossilOrigin-Name: e9d064bd9318c2bc9248df948f71fd30f24525eb

diff --git a/manifest b/manifest
index 44f4c77275eaff19b16f165af2171afd249fac08..59d073c66b09c62b5f01c771c9561556292f4a40 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Cleanup\sof\swarnings\son\sMSVC\sbuild.
-D 2009-09-10T19:09:03
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Make\ssure\sthe\sthreadsOverrideEachOthersLocks\svariable\sis\sonly\sreferenced\sby\nlinux\ssystems\son\sa\sthreadsafe\scompile.
+D 2009-09-10T19:20:03
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in e360e1214027efbf62cf18ac80ec646d4081c272
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -145,7 +148,7 @@ F src/os.c 8d62d8d98ad7909cb0dd294c1e5f3835c887ccb6
 F src/os.h 00a1334a4eecee7f7bef79ac606b88d325119f21
 F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
-F src/os_unix.c 4e5ce6099b6f9f711aced9283838f6a675194cc4
+F src/os_unix.c 5369272992c14dd198c02ddfc2fd7a1516906c40
 F src/os_win.c 58bb163f327e79726dd119344d908e4d98483c3f
 F src/pager.c ebd0a8f2421e8f0ad5b78201440004bf3e1c96d8
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
@@ -750,7 +753,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e5ce66d40bd68dc014071f7830112fa3b1d72948
-R 04bd1b4b03b4435f6d9dfff4d4ada826
-U shane
-Z ff1718cbce465b271b7903830a0be3d6
+P 5588cc96bbe0b9df5f8d31f8f2d2b48b3f54ff09
+R 48059c4d2f5d0989c3883467bec1489a
+U drh
+Z 5aa3ad6a21feb357d66dfc90a3ead484
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFKqVFpoxKgR168RlERAidFAJ9ANSUJCpqBktcIlgSELFvnrbpweQCbBlq5
+ewjd6VogivVCLe1QqVjspzo=
+=9Aym
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 5e3e5f103a5db00a603a1d3cbb2659b95090e378..8ba68846722cba6393b5873712c0eae1e01fe9b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5588cc96bbe0b9df5f8d31f8f2d2b48b3f54ff09
\ No newline at end of file
+e9d064bd9318c2bc9248df948f71fd30f24525eb
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index a45aaa1d73be2953534e531bbe3fe0d586364c02..ef04a72e4528b4a1b45b27a2e8cc373a328e0117 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -925,7 +925,9 @@ static void releaseOpenCnt(struct unixOpenCnt *pOpen){
         assert( pOpen->pNext->pPrev==pOpen );
         pOpen->pNext->pPrev = pOpen->pPrev;
       }
+#if SQLITE_THREADSAFE && defined(__linux__)
       assert( !pOpen->pUnused || threadsOverrideEachOthersLocks==0 );
+#endif
 
       /* If pOpen->pUnused is not null, then memory and file-descriptors
       ** are leaked.