From: Dan Albert <danalbert@google.com>
Date: Fri, 17 Mar 2017 18:47:09 +0000 (-0700)
Subject: Only rename mmap to mmap64 if we're L or newer.
X-Git-Tag: android-x86-8.1-r1~166^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=785b249df02434764db052507e956a2655fed0bb;p=android-x86%2Fbionic.git

Only rename mmap to mmap64 if we're L or newer.

Without this, setting `__USE_FILE_OFFSET64` and targeting pre-L made
mmap entirely unavailable.

Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/332
Change-Id: I9f61c44f8d9ab5c7cae845c9f89a7d889c6df365
---

diff --git a/libc/include/sys/mman.h b/libc/include/sys/mman.h
index 79f1faf03..a3dc95c46 100644
--- a/libc/include/sys/mman.h
+++ b/libc/include/sys/mman.h
@@ -49,7 +49,7 @@ __BEGIN_DECLS
 #define POSIX_MADV_WILLNEED   MADV_WILLNEED
 #define POSIX_MADV_DONTNEED   MADV_DONTNEED
 
-#if defined(__USE_FILE_OFFSET64)
+#if defined(__USE_FILE_OFFSET64) && __ANDROID_API__ >= __ANDROID_API_L__
 void* mmap(void*, size_t, int, int, int, off_t) __RENAME(mmap64) __INTRODUCED_IN(21);
 #else
 void* mmap(void*, size_t, int, int, int, off_t);