Commit 22fa7571 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot 0

Use the portability header for malloc_usable_size in small_vector.h

Summary: `small_vector.h` had it's own thing being defined inline, and it was breaking the OSX build of HHVM, so have it use the portability header instead.

Reviewed By: yfeldblum

Differential Revision: D3232885

fb-gh-sync-id: 2078a54d1ec9700e81e0a9f4baed8e2d623fa5f3
fbshipit-source-id: 2078a54d1ec9700e81e0a9f4baed8e2d623fa5f3
parent bccbb102
......@@ -47,6 +47,7 @@
#include <folly/FormatTraits.h>
#include <folly/Malloc.h>
#include <folly/Portability.h>
#include <folly/portability/Malloc.h>
#if defined(__GNUC__) && (FOLLY_X64 || FOLLY_PPC64)
# include <folly/SmallLocks.h>
......@@ -59,16 +60,6 @@
# define FB_PACK_POP
#endif
#if FOLLY_HAVE_MALLOC_SIZE
extern "C" std::size_t malloc_size(const void*);
# if !FOLLY_HAVE_MALLOC_USABLE_SIZE
# define malloc_usable_size malloc_size
# endif
# ifndef malloc_usable_size
# define malloc_usable_size malloc_size
# endif
#endif
// Ignore shadowing warnings within this file, so includers can use -Wshadow.
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment