diff options
| author | Elliott Hughes <enh@google.com> | 2013-09-19 14:30:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-19 14:30:57 -0700 |
| commit | 4d5d633bf862dbb0a960019e80fadc40c93177f0 (patch) | |
| tree | d8e6556368215c99da72baaaf48cc8bf99ac790a | |
| parent | 1998e505a98ad445bead87c2bb047053f1aea648 (diff) | |
| parent | 20eb7ac26435abb1b2514951eee07fee44773877 (diff) | |
| download | system_core-4d5d633bf862dbb0a960019e80fadc40c93177f0.tar.gz system_core-4d5d633bf862dbb0a960019e80fadc40c93177f0.tar.bz2 system_core-4d5d633bf862dbb0a960019e80fadc40c93177f0.zip | |
am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '20eb7ac26435abb1b2514951eee07fee44773877':
libsparse: Use BIONIC implementation of mmap64()
| -rw-r--r-- | libsparse/output_file.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libsparse/output_file.c b/libsparse/output_file.c index 5014e4a87..24280227e 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -46,15 +46,6 @@ #define off64_t off_t #endif -#ifdef __BIONIC__ -extern void* __mmap2(void *, size_t, int, int, int, off_t); -static inline void *mmap64(void *addr, size_t length, int prot, int flags, - int fd, off64_t offset) -{ - return __mmap2(addr, length, prot, flags, fd, offset >> 12); -} -#endif - #define min(a, b) \ ({ typeof(a) _a = (a); typeof(b) _b = (b); (_a < _b) ? _a : _b; }) |