Fix a couple compilation issues on Unix.

FossilOrigin-Name: 25b029d8f32440a94ef8af45153423f6702d7431

diff --git a/manifest b/manifest
index 6bcd5436edcaa66d5fe4d27a2074796e15d6243c..50cfe34e759c42e5fa9c09b2bdd4412e9d2c4059 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Unify\sthe\sresult\sof\sPRAGMA\smmap_size\swhen\smmap\ssupport\sis\sdisabled.
-D 2013-08-24T00:59:24.722
+C Fix\sa\scouple\scompilation\sissues\son\sUnix.
+D 2013-08-24T01:12:03.598
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -202,7 +202,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c e767bca6caa9db1eabc7e0657e425952d3272464
+F src/os_unix.c 44a2b26acd3f3f3a0b5d8495af945cec70a9e9df
 F src/os_win.c 1d84f2079d9b91f91a4b5dbfa5e08f1b1a0ed0ff
 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
@@ -1105,10 +1105,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P ed310201628cf79c0f57674ae7478ee6738b1c6e
-R bd8622b0fc71103f701b6641f54bb274
-T *branch * mmapDisabled
-T *sym-mmapDisabled *
-T -sym-trunk *
+P 032c31593d6f569842830cac6222362be68b2084
+R e9c8a1891e536319ba2e72bdf41d1b7c
 U mistachkin
-Z 80111f228705ea035bb71c4b1488f527
+Z cf772d6485c0eea6b9958d111508c114

diff --git a/manifest.uuid b/manifest.uuid
index 1b4ba748ad6451f3c29ecae79693c614f73b6d0b..3992a4377e06a6362a0e83b95642e7d4baaca1cc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-032c31593d6f569842830cac6222362be68b2084
\ No newline at end of file
+25b029d8f32440a94ef8af45153423f6702d7431
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 339bae703ba29418ac613ce03d679102e55cb9b4..0ae88517e4803c2d1e51a392b81ca455b2fc2797 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4810,6 +4810,7 @@ static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
   unixFile *pFd = (unixFile *)fd;   /* The underlying database file */
   UNUSED_PARAMETER(iOff);
 
+#if SQLITE_MAX_MMAP_SIZE>0
   /* If p==0 (unmap the entire file) then there must be no outstanding 
   ** xFetch references. Or, if p!=0 (meaning it is an xFetch reference),
   ** then there must be at least one outstanding.  */
@@ -4825,6 +4826,7 @@ static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
   }
 
   assert( pFd->nFetchOut>=0 );
+#endif
   return SQLITE_OK;
 }
 
@@ -5156,7 +5158,9 @@ static int fillInUnixFile(
   pNew->pVfs = pVfs;
   pNew->zPath = zFilename;
   pNew->ctrlFlags = (u8)ctrlFlags;
+#if SQLITE_MAX_MMAP_SIZE>0
   pNew->mmapSizeMax = sqlite3GlobalConfig.szMmap;
+#endif
   if( sqlite3_uri_boolean(((ctrlFlags & UNIXFILE_URI) ? zFilename : 0),
                            "psow", SQLITE_POWERSAFE_OVERWRITE) ){
     pNew->ctrlFlags |= UNIXFILE_PSOW;