From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Thu, 12 Mar 2020 22:47:03 +0000 (+0000)
Subject: local-revert-glibc_has_include
X-Git-Tag: archive/raspbian/2.30-2+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90f2c5c410fab16374702215ebbc56cda7add1b5;p=glibc.git

local-revert-glibc_has_include

Partial revert of upstream commit bfa864e1645e140da2e1aae3cf0d0ba0674f6eb5
until gcc stops providing fix-includes.


Gbp-Pq: Topic any
Gbp-Pq: Name local-revert-glibc_has_include.diff
---

diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index b1695376d..f1bd994a1 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -412,6 +412,14 @@
 # define __glibc_has_attribute(attr)	0
 #endif
 
+#ifdef __has_include
+/* 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
+
 #if (!defined _Noreturn \
      && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
      &&  !__GNUC_PREREQ (4,7))