[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-open-type-private.hh |    4 +---
 src/hb-subset.cc            |    4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2da0d87e769b2ced71e4281e336bdbca65de2b3f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 7 12:44:35 2018 -0500

    Remove NullPool visibility hack
    
    We keep a separate private NullPool in libharfbuzz-subset.so
    This can fire back later since now there are two separate null objects,
    and comparisons to the null pool can be confused.  Something to deal
    with when it comes up. Ouch!

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 959f743b..04e4a4e1 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -134,9 +134,7 @@ static inline Type& StructAfter(TObject &X)
 
 #define HB_NULL_POOL_SIZE 264
 static_assert (HB_NULL_POOL_SIZE % sizeof (void *) == 0, "Align HB_NULL_POOL_SIZE.");
-// TODO add back HB_INTERNAL once we figure out how to not have that break
-// subset compile
-extern const void * const _hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)];
+extern HB_INTERNAL const void * const _hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)];
 
 /* Generic nul-content Null objects. */
 template <typename Type>
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 5849efd2..7215b60b 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -34,6 +34,10 @@
 
 #include "hb-ot-glyf-table.hh"
 
+
+const void * const OT::_hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)] = {};
+
+
 struct hb_subset_profile_t {
   hb_object_header_t header;
   ASSERT_POD ();