Use glibc_likely instead __builtin_expect.

[jlayton/glibc.git] / iconvdata / cp1255.c

diff --git a/iconvdata/cp1255.c b/iconvdata/cp1255.c
index 9a05d3020cf3a6b0309cdf1980f4a31533ecc0bf..3106d2062f9241d9fb8e877941700b27e97928f3 100644 (file)
--- 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;                                                \