* merge lp:~mvo/apt/netrc branch, this adds support for a

[apt.git] / apt-pkg / contrib / mmap.cc

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 917466c2f98a883dd634d640ac1a54fede3a762a..4d5fcf71e67c5bdda2ddf504cf9c39c90d0d1ed9 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -201,7 +201,7 @@ DynamicMMap::~DynamicMMap()
    if (Fd == 0)
    {
 #ifdef _POSIX_MAPPED_FILES
-      if(munmap(Base, WorkSpace) < 0)
+      munmap(Base, WorkSpace);
 #else
       delete [] (unsigned char *)Base;
 #endif
@@ -317,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String,
    but why we should not at least try to grow it before we give up? */
 bool DynamicMMap::Grow()
 {
-#ifdef _POSIX_MAPPED_FILES
+#if defined(_POSIX_MAPPED_FILES) && defined(__linux__)
    unsigned long newSize = WorkSpace + 1024*1024;
 
    if(Fd != 0)