[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-layout.cc     |    1 +
 src/hb-ot-name-table.hh |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ec86cc5e552e9e8d64101feb1f540a9dc94a9025
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 30 14:11:59 2017 -0600

    Fix Windows build
    
    (And prevent it from happening in the future.)

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index df43c29e..8fe15313 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -35,6 +35,7 @@
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-layout-jstf-table.hh" // Just so we compile it; unused otherwise.
+#include "hb-ot-name-table.hh" // Just so we compile it; unused otherwise.
 
 #include "hb-ot-map-private.hh"
 
diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index 731a0dbb..8e688a6b 100644
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -42,8 +42,10 @@ namespace OT {
 
 struct NameRecord
 {
-  static int cmp (const NameRecord *a, const NameRecord *b)
+  static int cmp (const void *pa, const void *pb)
   {
+    const NameRecord *a = (const NameRecord *) pa;
+    const NameRecord *b = (const NameRecord *) pb;
     int ret;
     ret = b->platformID.cmp (a->platformID);
     if (ret) return ret;