From 05fdac772bee5352a52f26682dd351712e92f9b3 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 3 Jul 2014 01:30:02 +0530 Subject: Don't use __glibc_unlikely in shared code --- intl/loadmsgcat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intl') diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index 325d699c86..7497172e72 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -820,7 +820,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file, data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); - if (__glibc_likely (data != MAP_FAILED)) + if (__builtin_expect (data != MAP_FAILED, 1)) { /* mmap() call was successful. */ close (fd); @@ -1248,7 +1248,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file, /* Get the header entry and look for a plural specification. */ nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen); - if (__glibc_unlikely (nullentry == (char *) -1)) + if (__builtin_expect (nullentry == (char *) -1, 0)) { __libc_rwlock_fini (domain->conversions_lock); goto invalid; -- cgit 1.4.1