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

[Behdad Esfahbod]

 src/Makefile.am        |    4 ++--
 test/api/test-subset.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ccae99fdadcf86aeda15dc230a3ddcd6ff176533
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 14 11:12:09 2018 -0800

    Another try

diff --git a/src/Makefile.am b/src/Makefile.am
index dea2dc91..8288bd7f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,8 +37,8 @@ HBNOLIBCXXCFLAGS =
 else
 # Make sure we don't link to libstdc++
 # No threadsafe statics in C++ as we do it ourselves
-HBCFLAGS += -fno-threadsafe-statics
-HBNOLIBCXXFLAGS = -fno-rtti -fno-exceptions
+HBCFLAGS += -fno-threadsafe-statics -fno-exceptions
+HBNOLIBCXXFLAGS = -fno-rtti
 endif
 
 if HAVE_OT
commit f53627e19100df6eb7f32d58e7c4ce47a783f1a6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 14 10:59:22 2018 -0800

    [test] Fix warning

diff --git a/test/api/test-subset.c b/test/api/test-subset.c
index 68c00134..8edbf1d2 100644
--- a/test/api/test-subset.c
+++ b/test/api/test-subset.c
@@ -38,6 +38,7 @@ static const char test_data[] = { 0, 1, 0, 0,	/* sfntVersion */
 static void
 test_subset (void)
 {
+  unsigned int output_length;
   hb_blob_t *font_blob = hb_blob_create(test_data, sizeof(test_data),
 					HB_MEMORY_MODE_READONLY, NULL, NULL);
   hb_face_t *face = hb_face_create(font_blob, 0);
@@ -53,7 +54,6 @@ test_subset (void)
   g_assert(out_face != hb_face_get_empty ());
   output = hb_face_reference_blob (out_face);
 
-  unsigned int output_length;
   const char *output_data = hb_blob_get_data(output, &output_length);
   g_assert_cmpmem (test_data, sizeof (test_data), output_data, output_length);