From 1a2a4a0078dda834443edd421037a4bcbad18c5e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 5 May 2012 22:38:20 +0200 Subject: [PATCH] Fix warning and build issues As reported by Jonathan Kew on the list. --- src/hb-set-private.hh | 2 +- src/main.cc | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh index ee489d034..7dd19b9ef 100644 --- a/src/hb-set-private.hh +++ b/src/hb-set-private.hh @@ -136,7 +136,7 @@ struct _hb_set_t elt_t elts[ELTS]; /* 8kb */ ASSERT_STATIC (sizeof (elt_t) * 8 == BITS); - ASSERT_STATIC (sizeof (elts) * 8 > MAX_G); + ASSERT_STATIC (sizeof (elt_t) * 8 * ELTS > MAX_G); }; diff --git a/src/main.cc b/src/main.cc index 442b1b9ac..03b6e6ce9 100644 --- a/src/main.cc +++ b/src/main.cc @@ -124,10 +124,11 @@ main (int argc, char **argv) const LangSys &langsys = n_langsys == -1 ? script.get_default_lang_sys () : script.get_lang_sys (n_langsys); - printf (n_langsys == -1 - ? " Default Language System\n" - : " Language System %2d of %2d: %.4s\n", n_langsys, num_langsys, - (const char *)script.get_lang_sys_tag (n_langsys)); + if (n_langsys == -1) + printf (" Default Language System\n"); + else + printf (" Language System %2d of %2d: %.4s\n", n_langsys, num_langsys, + (const char *)script.get_lang_sys_tag (n_langsys)); if (langsys.get_required_feature_index () == Index::NOT_FOUND_INDEX) printf (" No required feature\n");