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

[Behdad Esfahbod]

 src/Makefile.am                 |    6 +++---
 src/hb-aat-layout-morx-table.hh |   12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit aeed082e282b97e40c2e8590bdd8818affc7de6c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Feb 13 14:02:59 2018 -0800

    Another tweak at libstdc++ things
    
    To fix this warning:
    
    cc1: warning: command line option ‘-fno-threadsafe-statics’ is valid for C++/ObjC++ but not for C

diff --git a/src/Makefile.am b/src/Makefile.am
index c4f1069a..ee8e1d56 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ else
 # Make sure we don't link to libstdc++
 # No threadsafe statics in C++ as we do it ourselves
 HBNOLIBCXXFLAGS = -fno-rtti -fno-exceptions
-HBCFLAGS += -fno-threadsafe-statics
+HBLIBCXXFLAGS = -fno-threadsafe-statics
 endif
 
 if HAVE_OT
@@ -178,7 +178,7 @@ FUZZING_CPPFLAGS = \
 EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la
 libharfbuzz_fuzzing_la_LINK = $(libharfbuzz_la_LINK)
 libharfbuzz_fuzzing_la_SOURCES = $(libharfbuzz_la_SOURCES)
-libharfbuzz_fuzzing_la_CPPFLAGS = $(HBCFLAGS) $(FUZZING_CPPFLAGS)
+libharfbuzz_fuzzing_la_CPPFLAGS = $(HBCFLAGS) $(HBLIBCXXFLAGS) $(FUZZING_CPPFLAGS)
 libharfbuzz_fuzzing_la_LDFLAGS = $(AM_LDFLAGS)
 libharfbuzz_fuzzing_la_LIBADD = $(libharfbuzz_la_LIBADD)
 EXTRA_libharfbuzz_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_la_DEPENDENCIES)
@@ -193,7 +193,7 @@ HBHEADERS += $(HB_ICU_headers)
 else
 lib_LTLIBRARIES += libharfbuzz-icu.la
 libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources)
-libharfbuzz_icu_la_CPPFLAGS = $(HBCFLAGS) $(ICU_CFLAGS)
+libharfbuzz_icu_la_CPPFLAGS = $(HBCFLAGS) $(HBLIBCXXFLAGS) $(ICU_CFLAGS)
 libharfbuzz_icu_la_LDFLAGS = $(base_link_flags) $(export_symbols_icu)
 libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la
 EXTRA_libharfbuzz_icu_la_DEPENDENCIES = $(harfbuzz_icu_def_dependency)
commit c7d7c9898e22905888dc4304f6d8e79b55654174
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Feb 13 14:00:14 2018 -0800

    [aat] Minor

diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index 6bd0267c..4cc28242 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -171,7 +171,7 @@ struct RearrangementSubtable
   }
 
   protected:
-  StateTable<void>	machine;
+  StateTable<EntryData>	machine;
   public:
   DEFINE_SIZE_STATIC (16);
 };
commit 2dbfeecf96c6993d42594f43133d945d67ddbdbc
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Feb 13 13:59:39 2018 -0800

    Minor

diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index 2bb80891..6bd0267c 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -40,6 +40,8 @@ using namespace OT;
 
 struct RearrangementSubtable
 {
+  typedef void EntryData;
+
   struct driver_context_t
   {
     static const bool in_place = true;
@@ -60,13 +62,13 @@ struct RearrangementSubtable
 	ret (false),
 	start (0), end (0) {}
 
-    inline bool is_actionable (StateTableDriver<void> *driver,
-			       const Entry<void> *entry)
+    inline bool is_actionable (StateTableDriver<EntryData> *driver,
+			       const Entry<EntryData> *entry)
     {
       return (entry->flags & Verb) && start < end;
     }
-    inline bool transition (StateTableDriver<void> *driver,
-			    const Entry<void> *entry)
+    inline bool transition (StateTableDriver<EntryData> *driver,
+			    const Entry<EntryData> *entry)
     {
       hb_buffer_t *buffer = driver->buffer;
       unsigned int flags = entry->flags;