From 7e8c38954649c0bf2e6051d84ca08dce090ec169 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 25 Jul 2014 11:18:11 -0400 Subject: [PATCH] Minor warnings fixes Some systems insist on -Wmissing-field-initializers. We have too many, by design. Fix a few easy ones. --- src/hb-open-type-private.hh | 2 +- src/hb-ot-layout-private.hh | 2 +- src/hb-private.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 046df9765..475187bae 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -289,7 +289,7 @@ template struct Sanitizer { static hb_blob_t *sanitize (hb_blob_t *blob) { - hb_sanitize_context_t c[1] = {{0}}; + hb_sanitize_context_t c[1] = {{0, NULL, NULL, false, 0, NULL}}; bool sane; /* TODO is_sane() stuff */ diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh index 9b0630080..d94ac5072 100644 --- a/src/hb-ot-layout-private.hh +++ b/src/hb-ot-layout-private.hh @@ -127,7 +127,7 @@ struct hb_ot_layout_lookup_accelerator_t } template - inline void fini (const TLookup &lookup) + inline void fini (const TLookup &lookup HB_UNUSED) { } diff --git a/src/hb-private.hh b/src/hb-private.hh index b24c9d1e3..5a4ca6991 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -284,7 +284,7 @@ typedef int (*hb_compare_func_t) (const void *, const void *); /* arrays and maps */ -#define HB_PREALLOCED_ARRAY_INIT {0} +#define HB_PREALLOCED_ARRAY_INIT {0, 0, NULL} template struct hb_prealloced_array_t {