Use glibc_likely instead __builtin_expect.

[jlayton/glibc.git] / stdlib / setenv.c

diff --git a/stdlib/setenv.c b/stdlib/setenv.c
index 6b5f9be8d5afd65da5216a26f69deef283c83742..e244e1833133813767dae659871e0983c7f40865 100644 (file)
--- a/stdlib/setenv.c
+++ b/stdlib/setenv.c
@@ -191,17 +191,17 @@ __add_to_environ (name, value, combined, replace)
 # endif
 
          np = KNOWN_VALUE (new_value);
-         if (__builtin_expect (np == NULL, 1))
+         if (__glibc_likely (np == NULL))
 #endif
            {
 #ifdef USE_TSEARCH
-             if (__builtin_expect (! use_alloca, 0))
+             if (__glibc_unlikely (! use_alloca))
                np = new_value;
              else
 #endif
                {
                  np = malloc (varlen);
-                 if (__builtin_expect (np == NULL, 0))
+                 if (__glibc_unlikely (np == NULL))
                    {
                      UNLOCK;
                      return -1;