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

[Behdad Esfahbod]

 src/hb-private.hh |    3 +++
 src/hb-subset.cc  |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e4d1cbfb4fbc17d7dbe08133d1e5e181e1c9bbc5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Mar 26 14:09:29 2018 -0700

    Add HB_SUBSET_BUILTIN
    
    Fixes https://github.com/harfbuzz/harfbuzz/issues/865

diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 75121c56..4062c9b4 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -44,7 +44,7 @@
 #include "hb-ot-post-table.hh"
 
 
-#ifndef HB_NO_VISIBILITY
+#if !defined(HB_NO_VISIBILITY) && !defined(HB_SUBSET_BUILTIN)
 const void * const OT::_hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)] = {};
 #endif
 
commit c14b24fcd0052fc6100c32deea6ee1dcb0c98f85
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Mar 26 10:44:54 2018 -0700

    Add HB_NO_ATEXIT

diff --git a/src/hb-private.hh b/src/hb-private.hh
index d0f997d6..e34bb76a 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -241,6 +241,9 @@ static int errno = 0; /* Use something better? */
 #    define HB_USE_ATEXIT 1
 #  endif
 #endif
+#ifdef HB_NO_ATEXIT
+#  undef HB_USE_ATEXIT
+#endif
 
 /* Basics */