diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-11 19:24:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-11 19:24:20 +0000 |
| commit | 2c0839e9dba6d9d282f8391c3edb14236f56618d (patch) | |
| tree | 5fccc608bda46f762ce00bb0aae0613590cbeb4a /include | |
| parent | b0d30271699ecd48be791bbd002d2366b831a624 (diff) | |
| parent | 266092c52dea85daaa14c671c1a2f133330f0ed8 (diff) | |
| download | system_core-2c0839e9dba6d9d282f8391c3edb14236f56618d.zip system_core-2c0839e9dba6d9d282f8391c3edb14236f56618d.tar.gz system_core-2c0839e9dba6d9d282f8391c3edb14236f56618d.tar.bz2 | |
Merge "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 |