| Index: third_party/sqlite/src/src/wal.h
|
| diff --git a/third_party/sqlite/src/src/wal.h b/third_party/sqlite/src/src/wal.h
|
| index 97e6ab4f10c16addeddae9ebe02388bc65281481..4f6d01dad6291da039036918a3b4c31296ebc89c 100644
|
| --- a/third_party/sqlite/src/src/wal.h
|
| +++ b/third_party/sqlite/src/src/wal.h
|
| @@ -14,8 +14,8 @@
|
| ** the implementation of each function in log.c for further details.
|
| */
|
|
|
| -#ifndef _WAL_H_
|
| -#define _WAL_H_
|
| +#ifndef SQLITE_WAL_H
|
| +#define SQLITE_WAL_H
|
|
|
| #include "sqliteInt.h"
|
|
|
| @@ -28,7 +28,7 @@
|
| #ifdef SQLITE_OMIT_WAL
|
| # define sqlite3WalOpen(x,y,z) 0
|
| # define sqlite3WalLimit(x,y)
|
| -# define sqlite3WalClose(w,x,y,z) 0
|
| +# define sqlite3WalClose(v,w,x,y,z) 0
|
| # define sqlite3WalBeginReadTransaction(y,z) 0
|
| # define sqlite3WalEndReadTransaction(z)
|
| # define sqlite3WalDbsize(y) 0
|
| @@ -38,7 +38,7 @@
|
| # define sqlite3WalSavepoint(y,z)
|
| # define sqlite3WalSavepointUndo(y,z) 0
|
| # define sqlite3WalFrames(u,v,w,x,y,z) 0
|
| -# define sqlite3WalCheckpoint(r,s,t,u,v,w,x,y,z) 0
|
| +# define sqlite3WalCheckpoint(q,r,s,t,u,v,w,x,y,z) 0
|
| # define sqlite3WalCallback(z) 0
|
| # define sqlite3WalExclusiveMode(y,z) 0
|
| # define sqlite3WalHeapMemory(z) 0
|
| @@ -56,7 +56,7 @@ typedef struct Wal Wal;
|
|
|
| /* Open and close a connection to a write-ahead log. */
|
| int sqlite3WalOpen(sqlite3_vfs*, sqlite3_file*, const char *, int, i64, Wal**);
|
| -int sqlite3WalClose(Wal *pWal, int sync_flags, int, u8 *);
|
| +int sqlite3WalClose(Wal *pWal, sqlite3*, int sync_flags, int, u8 *);
|
|
|
| /* Set the limiting size of a WAL file. */
|
| void sqlite3WalLimit(Wal*, i64);
|
| @@ -99,6 +99,7 @@ int sqlite3WalFrames(Wal *pWal, int, PgHdr *, Pgno, int, int);
|
| /* Copy pages from the log to the database file */
|
| int sqlite3WalCheckpoint(
|
| Wal *pWal, /* Write-ahead log connection */
|
| + sqlite3 *db, /* Check this handle's interrupt flag */
|
| int eMode, /* One of PASSIVE, FULL and RESTART */
|
| int (*xBusy)(void*), /* Function to call when busy */
|
| void *pBusyArg, /* Context argument for xBusyHandler */
|
| @@ -130,6 +131,7 @@ int sqlite3WalHeapMemory(Wal *pWal);
|
| #ifdef SQLITE_ENABLE_SNAPSHOT
|
| int sqlite3WalSnapshotGet(Wal *pWal, sqlite3_snapshot **ppSnapshot);
|
| void sqlite3WalSnapshotOpen(Wal *pWal, sqlite3_snapshot *pSnapshot);
|
| +int sqlite3WalSnapshotRecover(Wal *pWal);
|
| #endif
|
|
|
| #ifdef SQLITE_ENABLE_ZIPVFS
|
| @@ -143,4 +145,4 @@ int sqlite3WalFramesize(Wal *pWal);
|
| sqlite3_file *sqlite3WalFile(Wal *pWal);
|
|
|
| #endif /* ifndef SQLITE_OMIT_WAL */
|
| -#endif /* _WAL_H_ */
|
| +#endif /* SQLITE_WAL_H */
|
|
|