[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-font-private.hh |   21 ++++++++++-----------
 src/hb-font.cc         |   20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

New commits:
commit 28de104f15b80df4b678267c4488b7d09a42720c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Nov 4 22:00:25 2015 -0800

    Move variable-sized struct member to end
    
    Hopefully makes clang build happy

diff --git a/src/hb-font-private.hh b/src/hb-font-private.hh
index efc12a8..c45258b 100644
--- a/src/hb-font-private.hh
+++ b/src/hb-font-private.hh
@@ -61,17 +61,6 @@ struct hb_font_funcs_t {
 
   hb_bool_t immutable;
 
-  /* Don't access these directly.  Call font->get_*() instead. */
-
-  union get_t {
-    struct get_funcs_t {
-#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_func_t name;
-      HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
-#undef HB_FONT_FUNC_IMPLEMENT
-    } f;
-    void (*array[]) (void);
-  } get;
-
   struct {
 #define HB_FONT_FUNC_IMPLEMENT(name) void *name;
     HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
@@ -83,6 +72,16 @@ struct hb_font_funcs_t {
     HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
 #undef HB_FONT_FUNC_IMPLEMENT
   } destroy;
+
+  /* Don't access these directly.  Call font->get_*() instead. */
+  union get_t {
+    struct get_funcs_t {
+#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_func_t name;
+      HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+    } f;
+    void (*array[]) (void);
+  } get;
 };
 
 
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 33c644b..170dd55 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -287,6 +287,16 @@ static const hb_font_funcs_t _hb_font_funcs_nil = {
   true, /* immutable */
 
   {
+#define HB_FONT_FUNC_IMPLEMENT(name) NULL,
+    HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+  },
+  {
+#define HB_FONT_FUNC_IMPLEMENT(name) NULL,
+    HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+  },
+  {
 #define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil,
     HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
 #undef HB_FONT_FUNC_IMPLEMENT
@@ -298,6 +308,16 @@ static const hb_font_funcs_t _hb_font_funcs_parent = {
   true, /* immutable */
 
   {
+#define HB_FONT_FUNC_IMPLEMENT(name) NULL,
+    HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+  },
+  {
+#define HB_FONT_FUNC_IMPLEMENT(name) NULL,
+    HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+  },
+  {
 #define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_parent,
     HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
 #undef HB_FONT_FUNC_IMPLEMENT