diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 14:45:42 +0100 |
|---|---|---|
| committer | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 15:07:12 +0100 |
| commit | a1ffb40e32741f992c743e7b16c061fefa3747ac (patch) | |
| tree | 246a29a87b26cfd5d07b17070f85eb3785018de9 /iconvdata/ibm943.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'iconvdata/ibm943.c')
| -rw-r--r-- | iconvdata/ibm943.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iconvdata/ibm943.c b/iconvdata/ibm943.c index 495e37909e..0ca3327f29 100644 --- a/iconvdata/ibm943.c +++ b/iconvdata/ibm943.c @@ -65,7 +65,7 @@ __builtin_expect (res == 0, 0) && ch != 0)) \ { \ /* Use the IBM943 table for double byte. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. \ Store the intermediate result. */ \ @@ -135,7 +135,7 @@ uint32_t high; \ uint16_t pccode; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ rp = NULL; \ @@ -157,7 +157,7 @@ high = (sizeof (__ucs4_to_ibm943db) >> 1) \ / sizeof (__ucs4_to_ibm943db[0][FROM]); \ pccode = ch; \ - if (__builtin_expect (rp != NULL, 1)) \ + if (__glibc_likely (rp != NULL)) \ while (low < high) \ { \ i = (low + high) >> 1; \ @@ -174,7 +174,7 @@ } \ if (found) \ { \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -190,7 +190,7 @@ } \ else \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ |