Fix a problem with SQLITE_OMIT_WAL builds.

FossilOrigin-Name: 612b6d1b1f74eaf618520b90811eca10f978fc71

diff --git a/manifest b/manifest
index 1d0fee3b9db9e9de5fa8faebb1c87d4b77c56d0a..9d6dafaed609ff685f28492289eeefa8fdb75d6a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdisplay\sof\srecord\sdata\sin\sthe\s"NNNbd"\soutput\sof\sthe\sshowdb.exe\nutility\sprogram.
-D 2014-06-20T13:55:06.139
+C Fix\sa\sproblem\swith\sSQLITE_OMIT_WAL\sbuilds.
+D 2014-06-23T10:04:58.236
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -207,7 +207,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c 9a97268f1ea97ddea17f1c392f7c76197ac4cea9
+F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
 F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37
 F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
@@ -1179,7 +1179,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b451fe0cb92278deb7724e7995c1bd46ae83c119
-R ed297bdcc3956dc354f00523f5ca1d92
-U drh
-Z 0815d87a0909198bac782c1612f71277
+P f735c2497eaad15216c90c6b92fd5ceff460220a
+R d7976d2787b6fe6354165e317bb92fd4
+U dan
+Z fd6ff630a9de62a9d7a43a3d2f98ba30

diff --git a/manifest.uuid b/manifest.uuid
index d85d37c37c0c0dbdd1ba33dad435311c82dbab61..4ccc4a184ba5de4ac5a430b7eaab3b4870d27c6e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f735c2497eaad15216c90c6b92fd5ceff460220a
\ No newline at end of file
+612b6d1b1f74eaf618520b90811eca10f978fc71
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 7eb25c85f339291f40f763fb399260fb6356542f..347e82220c2a98e184873b22dcc53fd98fcde558 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -445,11 +445,11 @@ static struct unix_syscall {
   { "mremap",       (sqlite3_syscall_ptr)0,               0 },
 #endif
 #define osMremap ((void*(*)(void*,size_t,size_t,int,...))aSyscall[23].pCurrent)
-#endif
-
   { "getpagesize",  (sqlite3_syscall_ptr)unixGetpagesize, 0 },
 #define osGetpagesize ((int(*)(void))aSyscall[24].pCurrent)
 
+#endif
+
 }; /* End of the overrideable system calls */
 
 /*
@@ -3964,8 +3964,25 @@ static int unixDeviceCharacteristics(sqlite3_file *id){
   return rc;
 }
 
-#ifndef SQLITE_OMIT_WAL
+#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
+
+/*
+** Return the system page size.
+**
+** This function should not be called directly by other code in this file. 
+** Instead, it should be called via macro osGetpagesize().
+*/
+static int unixGetpagesize(void){
+#if defined(_BSD_SOURCE)
+  return getpagesize();
+#else
+  return (int)sysconf(_SC_PAGESIZE);
+#endif
+}
 
+#endif /* !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 */
+
+#ifndef SQLITE_OMIT_WAL
 
 /*
 ** Object used to represent an shared memory buffer.  
@@ -4116,20 +4133,6 @@ static int unixShmSystemLock(
   return rc;        
 }
 
-/*
-** Return the system page size.
-**
-** This function should not be called directly by other code in this file. 
-** Instead, it should be called via macro osGetpagesize().
-*/
-static int unixGetpagesize(void){
-#if defined(_BSD_SOURCE)
-  return getpagesize();
-#else
-  return (int)sysconf(_SC_PAGESIZE);
-#endif
-}
-
 /*
 ** Return the minimum number of 32KB shm regions that should be mapped at
 ** a time, assuming that each mapping must be an integer multiple of the