diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-11 19:53:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 19:53:38 +0000 |
| commit | 556f43820f90e78bbe8fc6f7dea6be865e975ab8 (patch) | |
| tree | ec79ae90089ea97bf6e90856b06844727267d500 /include | |
| parent | 62abd4c851c89ddc437af909791761cc3219ff00 (diff) | |
| parent | 2c0839e9dba6d9d282f8391c3edb14236f56618d (diff) | |
| download | system_core-556f43820f90e78bbe8fc6f7dea6be865e975ab8.zip system_core-556f43820f90e78bbe8fc6f7dea6be865e975ab8.tar.gz system_core-556f43820f90e78bbe8fc6f7dea6be865e975ab8.tar.bz2 | |
am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"
* commit '2c0839e9dba6d9d282f8391c3edb14236f56618d':
kill HAVE_POSIX_FILEMAP
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/FileMap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/utils/FileMap.h b/include/utils/FileMap.h index 02cb7df..6c0aa52 100644 --- a/include/utils/FileMap.h +++ b/include/utils/FileMap.h @@ -24,7 +24,7 @@ #include <utils/Compat.h> -#ifdef HAVE_WIN32_FILEMAP +#if defined(__MINGW32__) // Ensure that we always pull in winsock2.h before windows.h #ifdef HAVE_WINSOCK #include <winsock2.h> @@ -127,7 +127,7 @@ private: off64_t mDataOffset; // offset used when map was created void* mDataPtr; // start of requested data, offset from base size_t mDataLength; // length, measured from "mDataPtr" -#ifdef HAVE_WIN32_FILEMAP +#if defined(__MINGW32__) HANDLE mFileHandle; // Win32 file handle HANDLE mFileMapping; // Win32 file mapping handle #endif |