am 81906d4b: Merge "kill HAVE_MADVISE"

* commit '81906d4b0c508dc308606ca232eaa055255abd1e':
  kill HAVE_MADVISE
This commit is contained in:
Yabin Cui 2014-11-19 04:35:27 +00:00 committed by Android Git Automerger
commit 26d2b64ba8
1 changed files with 8 additions and 4 deletions

View File

@ -194,9 +194,9 @@ try_again:
}
// Provide guidance to the system.
#if !defined(_WIN32)
int FileMap::advise(MapAdvice advice)
{
#if !defined(_WIN32)
int cc, sysAdvice;
switch (advice) {
@ -214,7 +214,11 @@ int FileMap::advise(MapAdvice advice)
if (cc != 0)
ALOGW("madvise(%d) failed: %s\n", sysAdvice, strerror(errno));
return cc;
#else
return -1;
#endif
}
#else
int FileMap::advise(MapAdvice /* advice */)
{
return -1;
}
#endif