From: drh <drh@noemail.net>
Date: Fri, 8 Jan 2016 22:18:00 +0000 (+0000)
Subject: More #ifdef fixes for the unix VFS.
X-Git-Tag: version-3.11.0~172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24dbeae6f5d736074b16f1f432d209dddd2fb32a;p=thirdparty%2Fsqlite.git

More #ifdef fixes for the unix VFS.

FossilOrigin-Name: 122c111e360761de8166e16ca151cb7260ee9bf8
---

diff --git a/manifest b/manifest
index e79fa8d733..b7b8ae7c56 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\sfor\sSQLITE_OMIT_SHARED_CACHE,\swhich\swas\sbroken,\spossibly\nby\scheck-in\s[2d96aeba].
-D 2016-01-08T19:34:39.323
+C More\s#ifdef\sfixes\sfor\sthe\sunix\sVFS.
+D 2016-01-08T22:18:00.216
 F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@@ -317,7 +317,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c 0b8ed82a5d6cdd8c8f48520789b46a6fd3fcb3ba
+F src/os_unix.c 085352926299f5c5ced95c67bf6e4715f7989be0
 F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c 58d2593612acb6b542de6715b4af397ea1fa0a35
@@ -1406,7 +1406,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ceceea4c5ee242b20ebf216593c15c11ce2c369a
-R aa88b0148c6ce2e00f60d1f7cb2cd85a
+P 3392f8fa2ddf2c10ffe91ddd92470040c909b36d
+R 6d9dd78f2a8c3dbacbf5b70f6d546718
 U drh
-Z d454daea05e67b50f7d16f4e08b90e6b
+Z 1972a905aa5c7145f504034b11e18521
diff --git a/manifest.uuid b/manifest.uuid
index 7260cdc2d8..778dad919a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3392f8fa2ddf2c10ffe91ddd92470040c909b36d
\ No newline at end of file
+122c111e360761de8166e16ca151cb7260ee9bf8
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index c41b6c7c29..bf37ae69ed 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -446,7 +446,7 @@ static struct unix_syscall {
 #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
   { "munmap",       (sqlite3_syscall_ptr)munmap,          0 },
 #else
-  { "munmap",       (sqlite3_syscall_ptr),                0 },
+  { "munmap",       (sqlite3_syscall_ptr)9,                0 },
 #endif
 #define osMunmap ((void*(*)(void*,size_t))aSyscall[23].pCurrent)
 
@@ -457,7 +457,11 @@ static struct unix_syscall {
 #endif
 #define osMremap ((void*(*)(void*,size_t,size_t,int,...))aSyscall[24].pCurrent)
 
+#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
   { "getpagesize",  (sqlite3_syscall_ptr)unixGetpagesize, 0 },
+#else
+  { "getpagesize",  (sqlite3_syscall_ptr)0,               0 },
+#endif
 #define osGetpagesize ((int(*)(void))aSyscall[25].pCurrent)
 
   { "readlink",     (sqlite3_syscall_ptr)readlink,        0 },