From f4efbdfb44ebb7dfe4c19759c426153bdd48a1dd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 14 Oct 2018 22:20:08 -0500 Subject: =?UTF-8?q?regex:=20=5F=5Fbuiltin=5Fexpect=20=E2=86=92=20=5F=5Fgli?= =?UTF-8?q?bc=5Funlikely?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [BZ#23744] This refactoring was prompted by a problem when the regex code is used as part of Gnulib and when the builder’s compiler does not grok __builtin_expect. Problem reported for Gawk by Nelson H.F. Beebe in: https://lists.gnu.org/r/bug-gnulib/2018-09/msg00137.html Although this refactoring does not fix the problem directly, we might as well have Gawk use the now-preferred glibc style for when __builtin_expect is unavailable. * posix/regex_internal.h (BE): Remove. All uses replaced by __glibc_unlikely or __glibc_likely. --- posix/regex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'posix/regex.c') diff --git a/posix/regex.c b/posix/regex.c index d6591e8..a80e740 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -18,7 +18,7 @@ . */ #ifndef _LIBC -# include +# include # if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ # pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" -- cgit v1.1