From: drh <drh@noemail.net>
Date: Wed, 22 Dec 2010 21:48:50 +0000 (+0000)
Subject: Do not include &lt;sys/mmap.h&gt; if SQLITE_OMIT_WAL is defined.
X-Git-Tag: version-3.7.5~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b469f46083520476d9b328f17086e97c5590cd8c;p=thirdparty%2Fsqlite.git

Do not include &lt;sys/mmap.h&gt; if SQLITE_OMIT_WAL is defined.

FossilOrigin-Name: b82e85ece94c8e25c1dc3251f5444a295fbf8c89
---

diff --git a/manifest b/manifest
index ef6736f82b..5894989f76 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\stest\scases\sfor\sthe\snew\slookaside\shit\sand\smiss\sstatus\soutputs.\s\sAdd\nthe\soutput\sof\slookaside\shit\sand\smiss\sto\sthe\scommand-line\sshell\sstatistics.
-D 2010-12-21T21:28:38
+C Do\snot\sinclude\s&lt;sys/mmap.h&gt;\sif\sSQLITE_OMIT_WAL\sis\sdefined.
+D 2010-12-22T21:48:51
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
-F src/os_unix.c c43a55b46a6be81a4f29a52eb88245e5d7f342fa
+F src/os_unix.c aeaf65d261219ad96c021cfd0672509d83c005e4
 F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
 F src/pager.c c0aca5c733c15a16fe158c3215d857841a4e5381
 F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76
@@ -897,14 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8c3b06c299554759b67437e09ee7ef6420dacafc
-R 3d2dc28d218eda07e432c06d2acaf490
+P b0888047bb6d9ac55e29b9224df2ff650728bb78
+R 0a946df43b3c238f90360fc25b951e41
 U drh
-Z 978ce4a1633e46da2aa79d83b4cbd5d5
+Z 3ea172d138576a025bf2ce93fc7e3eec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNERwJoxKgR168RlERAicZAJwKgYzQDbPRBPAlwwf+g1uwhrnDewCePClG
-nEAmUkNjgcw8rSbTLPArTDg=
-=3YUL
+iD8DBQFNEnJJoxKgR168RlERAn0IAJ4p+41yKye5mYGJ8Gy2zjNRxLR9cACff/OG
+IVGOq0B0rEJQ0tWbOl8FLrM=
+=3XEk
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 886c84aa99..609190bea3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0888047bb6d9ac55e29b9224df2ff650728bb78
\ No newline at end of file
+b82e85ece94c8e25c1dc3251f5444a295fbf8c89
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index ba699632d7..edc716c987 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -119,7 +119,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
+#ifndef SQLITE_OMIT_WAL
 #include <sys/mman.h>
+#endif
 
 #if SQLITE_ENABLE_LOCKING_STYLE
 # include <sys/ioctl.h>