[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-private.hh |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cc6ea308d4c99b9dd6d625fa3a9b0ef62fa2614f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 12 17:21:52 2015 -0400

    Extern "C" custom-allocator declerations

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 165cd0d..be29391 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -60,10 +60,10 @@
  && defined(hb_calloc_impl) \
  && defined(hb_realloc_impl) \
  && defined(hb_free_impl)
-extern void* hb_malloc_impl(size_t size);
-extern void* hb_calloc_impl(size_t nmemb, size_t size);
-extern void* hb_realloc_impl(void *ptr, size_t size);
-extern void  hb_free_impl(void *ptr);
+extern "C" void* hb_malloc_impl(size_t size);
+extern "C" void* hb_calloc_impl(size_t nmemb, size_t size);
+extern "C" void* hb_realloc_impl(void *ptr, size_t size);
+extern "C" void  hb_free_impl(void *ptr);
 #define malloc hb_malloc_impl
 #define calloc hb_calloc_impl
 #define realloc hb_realloc_impl