From 3a3092398356c90788479fa75524a491e9d860cd Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 28 Aug 2013 09:44:19 +0530 Subject: [PATCH] Use __glibc_unlikely instead of __builtin_expect (..., 0) --- ChangeLog | 5 +++++ nscd/aicache.c | 2 +- sysdeps/posix/getaddrinfo.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e418e7..06ecaab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-28 Siddhesh Poyarekar + + * nscd/aicache.c (addhstaiX): Use __glibc_unlikely. + * sysdeps/posix/getaddrinfo.c (gaih_inet): Likewise. + 2013-08-27 Mike Frysinger [BZ #15897] diff --git a/nscd/aicache.c b/nscd/aicache.c index dceb4d6..fd55852 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -102,7 +102,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, "dns [!UNAVAIL=return] files", &nip); /* Initialize configurations. */ - if (__builtin_expect (!_res_hconf.initialized, 0)) + if (__glibc_unlikely (!_res_hconf.initialized)) _res_hconf_init (); if (__res_maybe_init (&_res, 0) == -1) no_more = 1; diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 7bb3ded..52177e4 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -802,7 +802,7 @@ gaih_inet (const char *name, const struct gaih_service *service, &nip); /* Initialize configurations. */ - if (__builtin_expect (!_res_hconf.initialized, 0)) + if (__glibc_unlikely (!_res_hconf.initialized)) _res_hconf_init (); if (__res_maybe_init (&_res, 0) == -1) no_more = 1; -- 2.7.4