aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordan <dan@noemail.net>2011-12-30 10:54:24 +0000
committerdan <dan@noemail.net>2011-12-30 10:54:24 +0000
commit0420b74a94e3a040f568854038915fc94bff1370 (patch)
tree9a1c40904e201bc6a8460f1946388f55bfb28fc6 /src
parent0e208252c92206760d2208603acf7d594f7489ce (diff)
downloadsqlite-0420b74a94e3a040f568854038915fc94bff1370.tar.gz
sqlite-0420b74a94e3a040f568854038915fc94bff1370.zip
Minor changes to fix compilation with SQLITE_OMIT_WAL and SQLITE_OMIT_WSD defined.
FossilOrigin-Name: 26a513a8d2dddfde82f5fd0a0e1cc186c9b0df94
Diffstat (limited to 'src')
-rw-r--r--src/test_multiplex.c4
-rw-r--r--src/wal.h12
2 files changed, 10 insertions, 6 deletions
diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index 45f731036..eceb8d74a 100644
--- 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 7cd84be99..fac762e87 100644
--- 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 */