summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2013-09-20 11:58:54 -0500
committerAndroid Git Automerger2013-09-20 11:58:54 -0500
commit60549075e83e615179720f930c618a530462bc3c (patch)
tree1a50349bb76d2b29250a237c26544b74ac9056d0 /libsparse
parentb5e14ead1ea7554914e9f332f51240520fb22eba (diff)
parent4d5d633bf862dbb0a960019e80fadc40c93177f0 (diff)
downloadplatform-system-core-60549075e83e615179720f930c618a530462bc3c.tar.gz
platform-system-core-60549075e83e615179720f930c618a530462bc3c.tar.xz
platform-system-core-60549075e83e615179720f930c618a530462bc3c.zip
am 4d5d633b: am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '4d5d633bf862dbb0a960019e80fadc40c93177f0': libsparse: Use BIONIC implementation of mmap64()
Diffstat (limited to 'libsparse')
-rw-r--r--libsparse/output_file.c9
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 @@
46#define off64_t off_t 46#define off64_t off_t
47#endif 47#endif
48 48
49#ifdef __BIONIC__
50extern void* __mmap2(void *, size_t, int, int, int, off_t);
51static inline void *mmap64(void *addr, size_t length, int prot, int flags,
52 int fd, off64_t offset)
53{
54 return __mmap2(addr, length, prot, flags, fd, offset >> 12);
55}
56#endif
57
58#define min(a, b) \ 49#define min(a, b) \
59 ({ typeof(a) _a = (a); typeof(b) _b = (b); (_a < _b) ? _a : _b; }) 50 ({ typeof(a) _a = (a); typeof(b) _b = (b); (_a < _b) ? _a : _b; })
60 51