Use glibc_likely instead __builtin_expect.

[thirdparty/glibc.git] / iconv / gconv_open.c

diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 69a1f65eb20fa64ab6ffb143f9668edec6855193..bfbe22bff6ad1675ad91415d98a0cf824524bf9e 100644 (file)
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -45,7 +45,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
   errhand = strchr (toset, '/');
   if (errhand != NULL)
     errhand = strchr (errhand + 1, '/');
-  if (__builtin_expect (errhand != NULL, 1))
+  if (__glibc_likely (errhand != NULL))
     {
       if (*++errhand == '\0')
        errhand = NULL;
@@ -318,7 +318,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                      struct __gconv_trans_data *curp = transp;
                      transp = transp->__next;
 
-                     if (__builtin_expect (curp->__trans_end_fct != NULL, 0))
+                     if (__glibc_unlikely (curp->__trans_end_fct != NULL))
                        curp->__trans_end_fct (curp->__data);
 
                      free (curp);