From 66a076400edfc7cd1dd0b5de178b0c2f29660557 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Sun, 1 Mar 2015 21:57:08 -0800 Subject: [PATCH] MacOS doesn't have malloc_usable_size() Summary: Use malloc_size() instead Test Plan: HHVM build on MacOS Reviewed By: joelm@fb.com Subscribers: trunkagent, folly-diffs@, yfeldblum FB internal diff: D1875364 Signature: t1:1875364:1425061479:7d8cec757c186fa8c30b6500fca6b2fe4c1ed137 --- folly/Portability.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/folly/Portability.h b/folly/Portability.h index 156e8bb4..dd2df1be 100644 --- a/folly/Portability.h +++ b/folly/Portability.h @@ -31,6 +31,10 @@ #include +#ifdef __APPLE__ +# include +#endif + #if FOLLY_HAVE_SCHED_H #include #ifndef FOLLY_HAVE_PTHREAD_YIELD @@ -255,4 +259,11 @@ using namespace FOLLY_GFLAGS_NAMESPACE; #include #endif +// MacOS doesn't have malloc_usable_size() +#if defined(__APPLE__) && !defined(FOLLY_HAVE_MALLOC_USABLE_SIZE) +inline size_t malloc_usable_size(void* ptr) { + return malloc_size(ptr); +} +#endif + #endif // FOLLY_PORTABILITY_H_ -- 2.34.1