Use glibc_likely instead __builtin_expect.

[thirdparty/glibc.git] / iconvdata / euc-jp.c

diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index b903091ff76d940f36858a7bbf935a7ade515d9e..a7f2ae351c08baf82b2578231beff3d206f54477 100644 (file)
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -57,7 +57,7 @@
           byte is also available.  */                                        \
        int ch2;                                                              \
                                                                              \
-       if (__builtin_expect (inptr + 1 >= inend, 0))                         \
+       if (__glibc_unlikely (inptr + 1 >= inend))                            \
          {                                                                   \
            /* The second byte is not available.  Store the                   \
               intermediate result.  */                                       \
@@ -68,7 +68,7 @@
        ch2 = inptr[1];                                                       \
                                                                              \
        /* All second bytes of a multibyte character must be >= 0xa1. */      \
-       if (__builtin_expect (ch2 < 0xa1, 0))                                 \
+       if (__glibc_unlikely (ch2 < 0xa1))                                    \
          STANDARD_FROM_LOOP_ERR_HANDLER (1);                                 \
                                                                              \
        if (ch == 0x8e)                                                       \
@@ -105,7 +105,7 @@
                result = __GCONV_INCOMPLETE_INPUT;                            \
                break;                                                        \
              }                                                               \
-           if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0))             \
+           if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR))                \
              /* Illegal character.  */                                       \
              STANDARD_FROM_LOOP_ERR_HANDLER (1);                             \
                                                                              \
@@ -151,7 +151,7 @@
        size_t found;                                                         \
                                                                              \
        /* See whether we have room for at least two characters.  */          \
-       if (__builtin_expect (outptr + 1 >= outend, 0))                       \
+       if (__glibc_unlikely (outptr + 1 >= outend))                          \
          {                                                                   \
            result = __GCONV_FULL_OUTPUT;                                     \
            break;                                                            \