[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-private.hh      |    1 +
 src/hb-subset.cc       |    2 ++
 src/main.cc            |    2 ++
 test/api/test-ot-tag.c |    2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b87cbe2bec1d589621ba143af59443f63230ffeb
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 7 14:11:26 2018 -0500

    Try fixing build for platforms that have no visibility attributes

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 67ede7cc..75cc38f7 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -124,6 +124,7 @@ extern "C" void  hb_free_impl(void *ptr);
 #  define HB_INTERNAL __attribute__((__visibility__("hidden")))
 # else
 #  define HB_INTERNAL
+#  define HB_NO_VISIBILITY 1
 # endif
 #endif
 
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index bb7d831f..a1c6833e 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -35,7 +35,9 @@
 #include "hb-ot-glyf-table.hh"
 
 
+#ifndef HB_NO_VISIBILITY
 const void * const OT::_hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)] = {};
+#endif
 
 
 struct hb_subset_profile_t {
diff --git a/src/main.cc b/src/main.cc
index 72de189d..d221e9da 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -37,7 +37,9 @@
 
 using namespace OT;
 
+#ifndef HB_NO_VISIBILITY
 const void * const OT::_hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)] = {};
+#endif
 
 int
 main (int argc, char **argv)
commit f70100417c71cff071c119607a7b75dcead05a05
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 7 13:58:23 2018 -0500

    [test] Minor

diff --git a/test/api/test-ot-tag.c b/test/api/test-ot-tag.c
index f5cbd9d1..1abbc1db 100644
--- a/test/api/test-ot-tag.c
+++ b/test/api/test-ot-tag.c
@@ -72,7 +72,7 @@ test_indic_tags (const char *s1, const char *s2, hb_script_t script)
 static void
 test_ot_tag_script_degenerate (void)
 {
-  hb_script_t t1, t2;
+  hb_tag_t t1, t2;
 
   g_assert_cmphex (HB_TAG_CHAR4 ("DFLT"), ==, HB_OT_TAG_DEFAULT_SCRIPT);