Minor changes to fix compilation with SQLITE_OMIT_WAL and SQLITE_OMIT_WSD defined.

FossilOrigin-Name: 26a513a8d2dddfde82f5fd0a0e1cc186c9b0df94

diff --git a/manifest b/manifest
index 47d18e93ef2ac7798bd9de5f454a76ff7575f08b..f98c6c5327d646a1cca141835773c458b218f4c6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\san\simplicit\si64-to-int\scast\sin\spager.c\sto\san\sexplicit\scast.
-D 2011-12-30T09:00:19.278
+C Minor\schanges\sto\sfix\scompilation\swith\sSQLITE_OMIT_WAL\sand\sSQLITE_OMIT_WSD\sdefined.
+D 2011-12-30T10:54:24.715
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
 F src/test_journal.c 2c06e4be6584d51b935dc8b353980a9388de62ef
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 8d416f29ad8573f32601f6056c9d2b17472e9ad5
-F src/test_multiplex.c 7a41891cda4c6b43298656d88e37e3c6244a90ff
+F src/test_multiplex.c 2bf2eb36c9eff73c808ba6d19388e2f577438d9e
 F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@ -251,7 +251,7 @@ F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
 F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
 F src/wal.c 4800adb021db953138eafdda825f95bc050e5b98
-F src/wal.h 42f8313f7aaf8913e2d1fdf7b47025c23491ea1d
+F src/wal.h eaa00b9a403ddda2b56d01b7afc19ef600f9363f
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c af623942514571895818b9b7ae11db95ae3b3d88
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
@@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 4edc5994b26e1fd3245572cb80242d07ba20a475
-R 1bc770471ba89216f7a16ad43b7ad6d5
+P 6a71ba9ce930838d44ed8d399075ba0723c9132b
+R 579eb5da5cf1f5387840a047b3fbeef2
 U dan
-Z 18d47a3b5d2edb28ffe71e9399d7b1d4
+Z 6dd1d82cc9bb099d02383a4750cf40f4

diff --git a/manifest.uuid b/manifest.uuid
index 1bde373959750475cf7ee4f29fb8c0caf878f05c..22d07c070d7a003968169f7e88cf3c5f051e412e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a71ba9ce930838d44ed8d399075ba0723c9132b
\ No newline at end of file
+26a513a8d2dddfde82f5fd0a0e1cc186c9b0df94
\ No newline at end of file

diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index 45f7310361fde9345dc07832c4b9040b132504a2..eceb8d74ab12aad3cfd60ce0e53718dcb89eda07 100644 (file)
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@ -511,7 +511,11 @@ static int multiplexOpen(
       ** falls at the end of a chunk.  A region of up to 64K following
       ** the pending byte is never written, so if the pending byte occurs
       ** near the end of a chunk, that chunk will be too small. */
+#ifndef SQLITE_OMIT_WSD
       extern int sqlite3PendingByte;
+#else
+      int sqlite3PendingByte = 0x40000000;
+#endif
       while( (sqlite3PendingByte % pGroup->szChunk)>=(pGroup->szChunk-65536) ){
         pGroup->szChunk += 65536;
       }

diff --git a/src/wal.h b/src/wal.h
index 7cd84be9972838ba4008569ddc8ffc9e88b13196..fac762e870f017140727e51d441babd1104a351b 100644 (file)
--- a/src/wal.h
+++ b/src/wal.h
@@ -19,6 +19,12 @@
 
 #include "sqliteInt.h"
 
+/* Additional values that can be added to the sync_flags argument of
+** sqlite3WalFrames():
+*/
+#define WAL_SYNC_TRANSACTIONS  0x20   /* Sync at the end of each transaction */
+#define SQLITE_SYNC_MASK       0x13   /* Mask off the SQLITE_SYNC_* values */
+
 #ifdef SQLITE_OMIT_WAL
 # define sqlite3WalOpen(x,y,z)                   0
 # define sqlite3WalLimit(x,y)
@@ -87,12 +93,6 @@ int sqlite3WalSavepointUndo(Wal *pWal, u32 *aWalData);
 /* Write a frame or frames to the log. */
 int sqlite3WalFrames(Wal *pWal, int, PgHdr *, Pgno, int, int);
 
-/* Additional values that can be added to the sync_flags argument of
-** sqlite3WalFrames():
-*/
-#define WAL_SYNC_TRANSACTIONS  0x20   /* Sync at the end of each transaction */
-#define SQLITE_SYNC_MASK       0x13   /* Mask off the SQLITE_SYNC_* values */
-
 /* Copy pages from the log to the database file */ 
 int sqlite3WalCheckpoint(
   Wal *pWal,                      /* Write-ahead log connection */