Use glibc_likely instead __builtin_expect.

[thirdparty/glibc.git] / iconvdata / cp1258.c

diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c
index bafa28cc18ae4fff32de3d81e13dbec49b1c7586..6dc13b2bdf0d4bddba44b8f439b203ee5e8d6f0e 100644 (file)
--- a/iconvdata/cp1258.c
+++ b/iconvdata/cp1258.c
@@ -66,7 +66,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;          \
@@ -375,7 +375,7 @@ static const struct
     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);                               \
@@ -802,7 +802,7 @@ static const struct
            res = 0;                                                          \
          }                                                                   \
                                                                              \
-       if (__builtin_expect (res != 0, 1))                                   \
+       if (__glibc_likely (res != 0))                                        \
          {                                                                   \
            *outptr++ = res;                                                  \
            inptr += 4;                                                       \
@@ -845,7 +845,7 @@ static const struct
                  }                                                           \
                                                                              \
                /* 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;                                                    \