diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-11 10:33:10 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2014-11-11 10:33:10 -0800 |
| commit | 6dff1dcd60809aa438b64b5cb692c00631be1d46 (patch) | |
| tree | ff9e7510c40d865ae31841daebaac0d046799b98 /libdex/SysUtil.cpp | |
| parent | b929a2792bb5d3e661ec6925b20aa6e5512b7b34 (diff) | |
| download | android_dalvik-6dff1dcd60809aa438b64b5cb692c00631be1d46.tar.gz android_dalvik-6dff1dcd60809aa438b64b5cb692c00631be1d46.tar.bz2 android_dalvik-6dff1dcd60809aa438b64b5cb692c00631be1d46.zip | |
kill HAVE_POSIX_FILEMAP
Bug: 18315579
Change-Id: I2077b76ca7273fcaeaa91dda8d5365dd0e6f13e4
Diffstat (limited to 'libdex/SysUtil.cpp')
| -rw-r--r-- | libdex/SysUtil.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libdex/SysUtil.cpp b/libdex/SysUtil.cpp index 825315ecc..5650be539 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 @@ static int getFileStartAndLength(int fd, off_t *start_, size_t *length_) 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 sysFakeMapFile(int fd, MemMapping* pMap) */ 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 sysMapFileInShmemWritableReadOnly(int fd, MemMapping* pMap) 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 sysMapFileSegmentInShmem(int fd, off_t start, size_t length, 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 @@ int sysChangeMapAccess(void* addr, size_t length, int wantReadWrite, */ void sysReleaseShmem(MemMapping* pMap) { -#ifdef HAVE_POSIX_FILEMAP +#if !defined(__MINGW32__) if (pMap->baseAddr == NULL && pMap->baseLength == 0) return; |