This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] Correct improper-inclusion check in bits/libio-ldbl.h.
- From: Zack Weinberg <zackw at panix dot com>
- To: libc-alpha at sourceware dot org
- Date: Sun, 31 Dec 2017 12:03:25 -0500
- Subject: [COMMITTED] Correct improper-inclusion check in bits/libio-ldbl.h.
- Authentication-results: sourceware.org; auth=none
The patch which moved libio.h proper into the bits directory also
changed the name of its guard macro, and I neglected to check whether
anything depended on that name. It turns out that there is a
conditionally-used bits header that looks at it; this broke both the
glibc and the libgcc build on at least sparc64-*-* and sparcv9-*-*.
I have pushed this immediately, ahead of testing, since it should correct
build failures. Testing is in progress.
zw
* libio/bits/libio-ldbl.h: Correct check for improper
inclusion. Add own multiple include guard.
---
ChangeLog | 5 +++++
libio/bits/libio-ldbl.h | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index cd6fc15767..75f1a1a14c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-31 Zack Weinberg <zackw@panix.com>
+
+ * libio/bits/libio-ldbl.h: Correct check for improper
+ inclusion. Add own multiple include guard.
+
2017-12-30 Aurelien Jarno <aurelien@aurel32.net>
Dmitry V. Levin <ldv@altlinux.org>
diff --git a/libio/bits/libio-ldbl.h b/libio/bits/libio-ldbl.h
index f238550e4b..b5fd97e359 100644
--- a/libio/bits/libio-ldbl.h
+++ b/libio/bits/libio-ldbl.h
@@ -16,9 +16,14 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _IO_STDIO_H
+#ifndef _BITS_LIBIO_LDBL_H
+#define _BITS_LIBIO_LDBL_H 1
+
+#ifndef _BITS_LIBIO_H
# error "Never include <bits/libio-ldbl.h> directly; use <libio.h> instead."
#endif
__LDBL_REDIR_DECL (_IO_vfscanf)
__LDBL_REDIR_DECL (_IO_vfprintf)
+
+#endif
--
2.15.1