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 959f743b9ad7122dbd6a1fc06997492513c4a90c..04e4a4e1ba9d42a8228a0a68347531d234c29a77 100644 (file)
--- 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 5849efd2e86945c6de02e9e02267d09576210fd1..7215b60b01a1ecb34ffb512acc8a082d311842dc 100644 (file)
--- 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 ();