diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-19 03:35:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 03:35:22 +0000 |
| commit | 8a902ae9ff1b6e28a388bf417b7ebb7c946996fc (patch) | |
| tree | b9dd5572fa73a5a6b789c24ef9126c787a47fb33 | |
| parent | cc1be8520f28edddb931cd845f52363e1ef848b5 (diff) | |
| parent | ad450e6361b13ebaa57bfa7f846159f2dbdbb710 (diff) | |
| download | system_core-8a902ae9ff1b6e28a388bf417b7ebb7c946996fc.zip system_core-8a902ae9ff1b6e28a388bf417b7ebb7c946996fc.tar.gz system_core-8a902ae9ff1b6e28a388bf417b7ebb7c946996fc.tar.bz2 | |
am ad450e63: am c8ad1809: Merge "kill HAVE_MADVISE"
* commit 'ad450e6361b13ebaa57bfa7f846159f2dbdbb710':
kill HAVE_MADVISE
| -rw-r--r-- | libutils/FileMap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp index 6d92f74..71f00dc 100644 --- a/libutils/FileMap.cpp +++ b/libutils/FileMap.cpp @@ -196,7 +196,7 @@ try_again: // Provide guidance to the system. int FileMap::advise(MapAdvice advice) { -#if HAVE_MADVISE +#if !defined(_WIN32) int cc, sysAdvice; switch (advice) { @@ -216,5 +216,5 @@ int FileMap::advise(MapAdvice advice) return cc; #else return -1; -#endif // HAVE_MADVISE +#endif } |