commit 9013f53c778d11e7ba7a8bf745882a3e29fe938d
author Yabin Cui <yabinc@google.com> Tue Nov 11 19:24:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 11 19:24:34 2014 +0000
tree ff9e7510c40d865ae31841daebaac0d046799b98
parent b929a2792bb5d3e661ec6925b20aa6e5512b7b34
parent 6dff1dcd60809aa438b64b5cb692c00631be1d46

Merge "kill HAVE_POSIX_FILEMAP"

libdex/SysUtil.cpp

diff --git a/libdex/SysUtil.cpp b/libdex/SysUtil.cpp
index 825315e..5650be5 100644
--- a/libdex/SysUtil.cpp
+++ b/libdex/SysUtil.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#ifdef HAVE_POSIX_FILEMAP
+#if !defined(__MINGW32__)
 # include <sys/mman.h>
 #endif
 #include <limits.h>
@@ -40,7 +40,7 @@
  */
 static void* sysCreateAnonShmem(size_t length)
 {
-#ifdef HAVE_POSIX_FILEMAP
+#if !defined(__MINGW32__)
     void* ptr;
 
     ptr = mmap(NULL, length, PROT_READ | PROT_WRITE,
@@ -106,7 +106,7 @@
     return 0;
 }
 
-#ifndef HAVE_POSIX_FILEMAP
+#if defined(__MINGW32__)
 int sysFakeMapFile(int fd, MemMapping* pMap)
 {
     /* No MMAP, just fake it by copying the bits.
@@ -149,7 +149,7 @@
  */
 int sysMapFileInShmemWritableReadOnly(int fd, MemMapping* pMap)
 {
-#ifdef HAVE_POSIX_FILEMAP
+#if !defined(__MINGW32__)
     off_t start;
     size_t length;
     void* memPtr;
@@ -193,7 +193,7 @@
 int sysMapFileSegmentInShmem(int fd, off_t start, size_t length,
     MemMapping* pMap)
 {
-#ifdef HAVE_POSIX_FILEMAP
+#if !defined(__MINGW32__)
     size_t actualLength;
     off_t actualStart;
     int adjust;
@@ -239,7 +239,7 @@
 int sysChangeMapAccess(void* addr, size_t length, int wantReadWrite,
     MemMapping* pMap)
 {
-#ifdef HAVE_POSIX_FILEMAP
+#if !defined(__MINGW32__)
     /*
      * Verify that "addr" is part of this mapping file.
      */
@@ -278,7 +278,7 @@
  */
 void sysReleaseShmem(MemMapping* pMap)
 {
-#ifdef HAVE_POSIX_FILEMAP
+#if !defined(__MINGW32__)
     if (pMap->baseAddr == NULL && pMap->baseLength == 0)
         return;