From: drh Date: Wed, 10 Oct 2012 12:14:09 +0000 (+0000) Subject: Define the sqlite3PagerWalFramesize() function even if SQLITE_OMIT_WAL is used. X-Git-Tag: version-3.7.15~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7c7031f5225298c0894982dbe064f22b1cacecc;p=thirdparty%2Fsqlite.git Define the sqlite3PagerWalFramesize() function even if SQLITE_OMIT_WAL is used. FossilOrigin-Name: 96247853ef3d556a13b899b4c907b9fa2c78d513 --- diff --git a/manifest b/manifest index d05905807a..3b2a08c67b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\ssupport\sfor\sURI\sfilenames\sin\ssqlite3_analyzer. -D 2012-10-10T10:52:46.274 +C Define\sthe\ssqlite3PagerWalFramesize()\sfunction\seven\sif\sSQLITE_OMIT_WAL\sis\sused. +D 2012-10-10T12:14:09.899 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -162,7 +162,7 @@ F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_unix.c 0d3a39dd576c9f384fd7772a2dadc67b144c6ce7 F src/os_win.c 28bd027791252a4012dffd4d64355a1eb84d761c -F src/pager.c a7ad8c38809edf0be545e8f52da5bcbb88885b38 +F src/pager.c 82f7182b3dbf5f5e776980aa76db2f591564b15e F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 @@ -1019,7 +1019,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 -P f7437153b90b25a1b77294a0f8d1b0bd4bd08c08 -R 2105f393c264a64ba38b0302c232c7c9 +P 6dc987d32ba4d09b811ef281cdae09be17ac936c +R 159ea0884945008d33ec5244036d0a43 U drh -Z 7d1ab82c25985c443fd0708e96445812 +Z b23bfe4dc4840e6dc74ff476b4883de1 diff --git a/manifest.uuid b/manifest.uuid index 0a70538785..245f13a5d8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6dc987d32ba4d09b811ef281cdae09be17ac936c \ No newline at end of file +96247853ef3d556a13b899b4c907b9fa2c78d513 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index a767d747fe..6fe09a4ef4 100644 --- a/src/pager.c +++ b/src/pager.c @@ -6916,6 +6916,8 @@ int sqlite3PagerCloseWal(Pager *pPager){ return rc; } +#endif /* !SQLITE_OMIT_WAL */ + #ifdef SQLITE_ENABLE_ZIPVFS /* ** A read-lock must be held on the pager when this function is called. If @@ -6945,6 +6947,4 @@ void *sqlite3PagerCodec(PgHdr *pPg){ } #endif /* SQLITE_HAS_CODEC */ -#endif /* !SQLITE_OMIT_WAL */ - #endif /* SQLITE_OMIT_DISKIO */