diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-03 22:09:42 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-03 22:09:42 +0000 |
| commit | db2d05f93ce7a790a1f50ed5b082539b566801e2 (patch) | |
| tree | f9798dd65c34397e50a7fff0a41fc160e645c2aa /iconvdata/gbk.c | |
| parent | b9583166c0acb0f792fd741edaf6b35b6851694a (diff) | |
| download | glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.zip glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.gz glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.bz2 | |
Update.
* iconvdata/8bit-gap.c: Correctly use __builtin_expect.
* iconvdata/ansi_x3.110.c: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/euc-cn.c: Likewise.
* iconvdata/euc-jp.c: Likewise.
* iconvdata/euc-kr.c: Likewise.
* iconvdata/gb18030.c: Likewise.
* iconvdata/gbbig5.c: Likewise.
* iconvdata/gbgbk.c: Likewise.
* iconvdata/gbk.c: Likewise.
* iconvdata/ibm930.c: Likewise.
* iconvdata/ibm932.c: Likewise.
* iconvdata/ibm933.c: Likewise.
* iconvdata/ibm935.c: Likewise.
* iconvdata/ibm939.c: Likewise.
* iconvdata/ibm943.c: Likewise.
* iconvdata/iso-2022-cn.c: Likewise.
* iconvdata/iso-2022-kr.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso_6937-2.c: Likewise.
* iconvdata/iso_6937.c: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t.61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* iconvdata/unicode.c: Likewise.
* iconvdata/utf-16.c: Likewise.
* iconv/gconv_simple.c: Likewise. Convert assert() in real error
handling.
Diffstat (limited to 'iconvdata/gbk.c')
| -rw-r--r-- | iconvdata/gbk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index 8de6b35..98f0537 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -13145,8 +13145,8 @@ static const char __gbk_from_ucs4_tab12[][2] = if (ch <= 0x7f) \ ++inptr; \ else \ - if (__builtin_expect (ch, 0x81) <= 0x80 \ - || __builtin_expect (ch, 0x81) > 0xfe) \ + if (__builtin_expect (ch <= 0x80, 0) \ + || __builtin_expect (ch > 0xfe, 0)) \ { \ /* This is illegal. */ \ if (! ignore_errors_p ()) \ @@ -13178,7 +13178,7 @@ static const char __gbk_from_ucs4_tab12[][2] = \ /* All second bytes of a multibyte character must be >= 0x40, and \ the __gbk_to_ucs table only covers the range up to 0xfe 0xa0. */ \ - if (__builtin_expect (ch2, 0x41) < 0x40 \ + if (__builtin_expect (ch2 < 0x40, 0) \ || (__builtin_expect (ch, 0x81) == 0xfe && ch2 > 0xa0)) \ { \ /* This is an illegal character. */ \ |