src/hb-font.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a6991813659376a6a11c00a9f67d85b4f7ba9b5d
Merge: 1dc32ea f19c6db
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Fri Nov 20 13:28:42 2015 -0800
Merge pull request #176 from behdad/missing-braces
Add braces for subobject initializer in _hb_font_funcs_nil
commit f19c6db18e2e2dd0e9a406fc7e8533049fab48b0
Author: jfkthame <jfkth...@gmail.com>
Date: Fri Nov 20 08:43:49 2015 +0000
Add braces for subobject initializer in _hb_font_funcs_nil
To avoid triggering -Wmissing-braces; see
https://bugzilla.mozilla.org/show_bug.cgi?id=1226175#c8
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 170dd55..00f9fb6 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -297,9 +297,11 @@ static const hb_font_funcs_t _hb_font_funcs_nil = {
#undef HB_FONT_FUNC_IMPLEMENT
},
{
+ {
#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil,
- HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+ HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
#undef HB_FONT_FUNC_IMPLEMENT
+ }
}
};
static const hb_font_funcs_t _hb_font_funcs_parent = {
@@ -318,9 +320,11 @@ static const hb_font_funcs_t _hb_font_funcs_parent = {
#undef HB_FONT_FUNC_IMPLEMENT
},
{
+ {
#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_parent,
- HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+ HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
#undef HB_FONT_FUNC_IMPLEMENT
+ }
}
};
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/harfbuzz
