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

[Behdad Esfahbod]

 test/api/test-map.c     |    2 +-
 test/api/test-ot-name.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f70f994112b2577271c20a929f7b980fa1d17428
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Oct 19 20:00:36 2018 -0700

    Minor

diff --git a/test/api/test-ot-name.c b/test/api/test-ot-name.c
index d5345bf1..2da504ac 100644
--- a/test/api/test-ot-name.c
+++ b/test/api/test-ot-name.c
@@ -31,7 +31,7 @@ static const char *font_path = "fonts/cv01.otf";
 static hb_face_t *face;
 
 static void
-test_ot_layout_feature_get_name_ids_and_characters ()
+test_ot_layout_feature_get_name_ids_and_characters (void)
 {
   hb_tag_t cv01 = HB_TAG ('c','v','0','1');
   unsigned int feature_index;
commit 4e09fb8f7a93ec0c8d7f71cd58772ba468b5523f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Oct 19 19:59:41 2018 -0700

    Oops. Fix build

diff --git a/test/api/test-map.c b/test/api/test-map.c
index cc797fba..0d8be0bb 100644
--- a/test/api/test-map.c
+++ b/test/api/test-map.c
@@ -69,7 +69,7 @@ test_map_userdata (void)
   hb_user_data_key_t key[2];
   int *data = (int *) malloc (sizeof (int));
   *data = 3123;
-  hb_map_set_user_data (m, &key[0], data, free, true);
+  hb_map_set_user_data (m, &key[0], data, free, TRUE);
   g_assert_cmpint (*((int *) hb_map_get_user_data (m, &key[0])), ==, 3123);
 
   int *data2 = (int *) malloc (sizeof (int));