From 5e9863f3c63c6b9060d270d5cf959e16ac1294bb Mon Sep 17 00:00:00 2001 From: blueshade7 Date: Mon, 18 Nov 2019 15:40:43 -0800 Subject: [PATCH] ARRAY_LENGTH fails with -Wglobal-constructors --- src/hb-string-array.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-string-array.hh b/src/hb-string-array.hh index acd8fd6e7..9d77ec478 100644 --- a/src/hb-string-array.hh +++ b/src/hb-string-array.hh @@ -67,7 +67,7 @@ static const unsigned int HB_STRING_ARRAY_OFFS_NAME[] = sizeof (HB_STRING_ARRAY_TYPE_NAME) }; -static const unsigned int HB_STRING_ARRAY_LENG_NAME = ARRAY_LENGTH (HB_STRING_ARRAY_OFFS_NAME) - 1; +static const unsigned int HB_STRING_ARRAY_LENG_NAME = ARRAY_LENGTH_CONST (HB_STRING_ARRAY_OFFS_NAME) - 1; static inline hb_bytes_t HB_STRING_ARRAY_NAME (unsigned int i)