From 9d77023bf33ca5d0b07c318fe9fbe4347f0ae25a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 5 Jul 2022 10:30:20 +0200 Subject: localedef: Support building for older C standards Fixes commit b15538d77c6a7893c8bb42831dcd3a1a12b727d4 ("locale: localdef input files are now encoded in UTF-8"). --- locale/programs/linereader.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'locale') diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c index b484327969..0460074a0c 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -330,15 +330,17 @@ lr_token (struct linereader *lr, const struct charmap_t *charmap, break; case 0x80 ... 0xff: /* UTF-8 sequence. */ - uint32_t wch; - if (!utf8_decode (lr, ch, &wch)) - { - lr->token.tok = tok_error; - return &lr->token; - } - lr->token.tok = tok_ucs4; - lr->token.val.ucs4 = wch; - return &lr->token; + { + uint32_t wch; + if (!utf8_decode (lr, ch, &wch)) + { + lr->token.tok = tok_error; + return &lr->token; + } + lr->token.tok = tok_ucs4; + lr->token.val.ucs4 = wch; + return &lr->token; + } } return get_ident (lr); -- cgit 1.4.1