summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/cdefs.h6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ebc32bea1..db0b1c1f53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-04 Bruno Haible <bruno@clisp.org>
+
+ libc-config: Avoid overriding the headers from an installed newer glibc.
+ Reported by Paul E Murphy <murphyp@linux.ibm.com> in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00106.html>.
+ * lib/cdefs.h: Use a different include guard than glibc's <sys/cdefs.h>.
+
2021-01-04 Simon Josefsson <simon@josefsson.org>
maintainer-makefile: Invoke syntax-checks regardless of locale.
diff --git a/lib/cdefs.h b/lib/cdefs.h
index 6b1cf233d6..fd72b7b4de 100644
--- a/lib/cdefs.h
+++ b/lib/cdefs.h
@@ -15,8 +15,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#ifndef _SYS_CDEFS_H
-#define _SYS_CDEFS_H 1
+#ifndef _GL_CDEFS_H
+#define _GL_CDEFS_H 1
/* We are almost always included from features.h. */
#ifndef _FEATURES_H
@@ -545,4 +545,4 @@
# define __HAVE_GENERIC_SELECTION 0
#endif
-#endif /* sys/cdefs.h */
+#endif /* gnulib cdefs.h */