diff options
| author | Elliott Hughes <enh@google.com> | 2013-09-19 14:25:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-19 14:25:01 -0700 |
| commit | 20eb7ac26435abb1b2514951eee07fee44773877 (patch) | |
| tree | b1b9c956f9d2cf6883bff8e48c0fb4899185244b /libsparse | |
| parent | 2e9402863b40fe8bf2ddd8169c62f2419d968ff9 (diff) | |
| parent | 3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e (diff) | |
| download | system_core-20eb7ac26435abb1b2514951eee07fee44773877.tar.gz system_core-20eb7ac26435abb1b2514951eee07fee44773877.tar.bz2 system_core-20eb7ac26435abb1b2514951eee07fee44773877.zip | |
am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e':
libsparse: Use BIONIC implementation of mmap64()
Diffstat (limited to 'libsparse')
| -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; }) |