From: drh <drh@noemail.net>
Date: Tue, 5 Oct 2010 18:22:47 +0000 (+0000)
Subject: Do not embedded #if inside an assert() statement.
X-Git-Tag: version-3.7.4~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7f55edb68b78f221f2459719d0a7d0f2b3c59ad;p=thirdparty%2Fsqlite.git

Do not embedded #if inside an assert() statement.
Fix for check-in [dca8763872a]

FossilOrigin-Name: d7d4a94fc1209fd32d7c8e20ac83eb169b81ee25
---

diff --git a/manifest b/manifest
index 3776d565ab..71b461463a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Have\sthe\spager\schange\sto\sat\sleast\sWRITER_CACHEMOD\sstate\sbefore\smarking\sany\spages\sas\sdirty\s(instead\sof\simmediately\safter).\sOtherwise,\sif\san\serror\soccurs,\sthe\spager\smay\sbe\sleft\sin\sWRITER_LOCKED\sstate\swith\sdirty\spages\sin\sthe\scache.
-D 2010-10-05T17:02:48
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Do\snot\sembedded\s#if\sinside\san\sassert()\sstatement.\nFix\sfor\scheck-in\s[dca8763872a]
+D 2010-10-05T18:22:48
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -159,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
-F src/os_unix.c ae27ac760ad9c79f0fa3c96bfb31975c45aa704d
+F src/os_unix.c 00a4a84aba46b61439913bebf0c10d408e42a630
 F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
 F src/pager.c 6c6dde871c540438862d5169650544d843e5b7f7
 F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad
@@ -872,7 +875,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 04dcba6b3379d2168609950ed919c8f743705333
-R bdadc2754b2c663c0809da21888af26a
-U dan
-Z 210a2f6d2e9b55ba1bed3a89142a775f
+P 471a4efbb7e5e32b144b2e2128337a6af950b8f5
+R 433709481784cf8c0bddd1598c7f35a7
+U drh
+Z f40360de42f6696b1934fc46d9581f6d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMq2z8oxKgR168RlERApTxAKCFsrz56lS7fNVHPGbg4j3YEpHjlQCcDYLf
+iKhqx4Kkj+iVGUocuwANMTs=
+=o6C0
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 415217164a..b5e7a24ad4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-471a4efbb7e5e32b144b2e2128337a6af950b8f5
\ No newline at end of file
+d7d4a94fc1209fd32d7c8e20ac83eb169b81ee25
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index a28db0bf0c..2b38fd6ca1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4081,11 +4081,12 @@ static int fillInUnixFile(
   ** exception is when opening the proxy "conch" file in builds that
   ** include the special Apple locking styles.
   */
-  assert( zFilename==0 || zFilename[0]=='/' 
 #if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
-    || pVfs->pAppData==(void*)&autolockIoFinder
+  assert( zFilename==0 || zFilename[0]=='/' 
+    || pVfs->pAppData==(void*)&autolockIoFinder );
+#else
+  assert( zFilename==0 || zFilename[0]=='/' );
 #endif
-  );
 
   OSTRACE(("OPEN    %-3d %s\n", h, zFilename));
   pNew->h = h;