diff options
Diffstat (limited to 'iconvdata/iso_6937.c')
| -rw-r--r-- | iconvdata/iso_6937.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c index 27e9c2e4de..2340e53849 100644 --- a/iconvdata/iso_6937.c +++ b/iconvdata/iso_6937.c @@ -392,7 +392,7 @@ static const char from_ucs4[][2] = { \ uint32_t ch = *inptr; \ \ - if (__builtin_expect (ch, 0) >= 0xc1 && ch <= 0xcf) \ + if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \ { \ /* Composed character. First test whether the next character \ is also available. */ \ @@ -408,8 +408,8 @@ static const char from_ucs4[][2] = \ ch2 = inptr[1]; \ \ - if (__builtin_expect (ch2, 0) < 0x20 \ - || __builtin_expect (ch2, 0) >= 0x80) \ + if (__builtin_expect (ch2 < 0x20, 0) \ + || __builtin_expect (ch2 >= 0x80, 0)) \ { \ /* This is illegal. */ \ if (! ignore_errors_p ()) \ @@ -482,8 +482,8 @@ static const char from_ucs4[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if ((size_t) __builtin_expect (ch, 0) \ - >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \ + if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \ + 0)) \ { \ int fail = 0; \ switch (ch) \ |