aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-06-28 11:23:09 +0000
committerdan <dan@noemail.net>2010-06-28 11:23:09 +0000
commit38e1a279c992a4493bcc71ddaa58e772c993ff29 (patch)
tree34ee432630237fc72a55ad7d70e42c0d2feccfef /src
parent9c788140f7d96bcb6662454b96e2dc418ceeb10d (diff)
downloadsqlite-38e1a279c992a4493bcc71ddaa58e772c993ff29.tar.gz
sqlite-38e1a279c992a4493bcc71ddaa58e772c993ff29.zip
Fix some errors when compiling with SQLITE_OMIT_WAL.
FossilOrigin-Name: 3b68cb9c656db8c5c481199919a98f5764f7ebfa
Diffstat (limited to 'src')
-rw-r--r--src/pager.c2
-rw-r--r--src/test1.c2
-rw-r--r--src/wal.h3
3 files changed, 6 insertions, 1 deletions
diff --git a/src/pager.c b/src/pager.c
index 1d816b084..9bef3ae7a 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -221,7 +221,9 @@ struct PagerSavepoint {
Bitvec *pInSavepoint; /* Set of pages in this savepoint */
Pgno nOrig; /* Original number of pages in file */
Pgno iSubRec; /* Index of first record in sub-journal */
+#ifndef SQLITE_OMIT_WAL
u32 aWalData[WAL_SAVEPOINT_NDATA]; /* WAL savepoint context */
+#endif
};
/*
diff --git a/src/test1.c b/src/test1.c
index e636bb1b8..64a6b8fb0 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -5213,9 +5213,11 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
(char*)&sqlite3WhereTrace, TCL_LINK_INT);
Tcl_LinkVar(interp, "sqlite_os_trace",
(char*)&sqlite3OSTrace, TCL_LINK_INT);
+#ifndef SQLITE_OMIT_WAL
Tcl_LinkVar(interp, "sqlite_wal_trace",
(char*)&sqlite3WalTrace, TCL_LINK_INT);
#endif
+#endif
#ifndef SQLITE_OMIT_DISKIO
Tcl_LinkVar(interp, "sqlite_opentemp_count",
(char*)&sqlite3_opentemp_count, TCL_LINK_INT);
diff --git a/src/wal.h b/src/wal.h
index 34710a408..f29d5838f 100644
--- a/src/wal.h
+++ b/src/wal.h
@@ -27,13 +27,14 @@
# define sqlite3WalRead(v,w,x,y,z) 0
# define sqlite3WalDbsize(y,z)
# define sqlite3WalBeginWriteTransaction(y) 0
-# define sqlite3WalEndWRiteTransaction(x) 0
+# define sqlite3WalEndWriteTransaction(x) 0
# define sqlite3WalUndo(x,y,z) 0
# define sqlite3WalSavepoint(y,z)
# define sqlite3WalSavepointUndo(y,z) 0
# define sqlite3WalFrames(u,v,w,x,y,z) 0
# define sqlite3WalCheckpoint(u,v,w,x) 0
# define sqlite3WalCallback(z) 0
+# define sqlite3WalExclusiveMode(y,z) 0
#else
#define WAL_SAVEPOINT_NDATA 4