From 8d141877e07cc594e9fefc3795b8ba729288093c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 14 Jun 2019 15:46:02 +0200 Subject: : Inhibit macro expansion for __glibc_has_include This is currently ineffective with GCC because of GCC PR 80005, but it makes sense to anticipate a fix for this defect. Suggested by Zack Weinberg. Reviewed-by: Carlos O'Donell --- ChangeLog | 6 ++++++ misc/sys/cdefs.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc12a3e8ec..4aae5e74f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-06-14 Florian Weimer + + * misc/sys/cdefs.h (__glibc_has_include): Do not use a + function-like macro, so that __has_include can inhibit expansion + of its argument. + 2019-06-13 Joseph Myers * sysdeps/unix/sysv/linux/bits/in.h (IPV6_ROUTER_ALERT_ISOLATE): diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 638872b87b..f1bd994a10 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -413,7 +413,9 @@ #endif #ifdef __has_include -# define __glibc_has_include(header) __has_include (header) +/* Do not use a function-like macro, so that __has_include can inhibit + macro expansion. */ +# define __glibc_has_include __has_include #else # define __glibc_has_include(header) 0 #endif -- cgit v1.2.3-70-g09d2