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/cp1255.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
| download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.xz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.zip | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'iconvdata/cp1255.c')
| -rw-r--r-- | iconvdata/cp1255.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iconvdata/cp1255.c b/iconvdata/cp1255.c index 9a05d3020c..3106d2062f 100644 --- a/iconvdata/cp1255.c +++ b/iconvdata/cp1255.c @@ -65,7 +65,7 @@ { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -201,7 +201,7 @@ static const struct { unsigned int idx; unsigned int len; } comp_table[8] = { if (ch >= 0x80) \ { \ ch = to_ucs4[ch - 0x80]; \ - if (__builtin_expect (ch == L'\0', 0)) \ + if (__glibc_unlikely (ch == L'\0')) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -463,7 +463,7 @@ static const struct { res = 0; \ } \ \ - if (__builtin_expect (res != 0, 1)) \ + if (__glibc_likely (res != 0)) \ { \ *outptr++ = res; \ inptr += 4; \ @@ -515,7 +515,7 @@ static const struct { if (decomp_table[i].comb2 < 0) \ { \ /* See whether we have room for two bytes. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -527,7 +527,7 @@ static const struct { else \ { \ /* See whether we have room for three bytes. */ \ - if (__builtin_expect (outptr + 2 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 2 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ |