| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 6b2b136caa68912d77ffe26143cd3da768b9ef80 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 3 Jun 2017 08:39:37 -0700 |
| 4 | Subject: [PATCH] mallinfo() is glibc specific API mark it so |
| 5 | |
| 6 | Helps compiling with musl |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | src/tbbmalloc/proxy.cpp | 2 ++ |
| 13 | 1 file changed, 2 insertions(+) |
| 14 | |
| 15 | diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp |
| 16 | index 5ef279d..06c4872 100644 |
| 17 | --- a/src/tbbmalloc/proxy.cpp |
| 18 | +++ b/src/tbbmalloc/proxy.cpp |
| 19 | @@ -185,6 +185,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW |
| 20 | return 1; |
| 21 | } |
| 22 | |
| 23 | +#ifdef __GLIBC__ |
| 24 | struct mallinfo mallinfo() __THROW |
| 25 | { |
| 26 | struct mallinfo m; |
| 27 | @@ -192,6 +193,7 @@ struct mallinfo mallinfo() __THROW |
| 28 | |
| 29 | return m; |
| 30 | } |
| 31 | +#endif |
| 32 | |
| 33 | #if __ANDROID__ |
| 34 | // Android doesn't have malloc_usable_size, provide it to be compatible |
| 35 | -- |
| 36 | 2.13.0 |
| 37 | |