From 4f820792a6217027744d38fc223257914847bbcc Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sun, 31 Dec 2017 08:50:34 -0800 Subject: Correct improper-inclusion check in bits/libio-ldbl.h. 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 the libgcc build on at least sparc64-*-* and sparcv9-*-*. * 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 + + * libio/bits/libio-ldbl.h: Correct check for improper + inclusion. Add own multiple include guard. + 2017-12-30 Aurelien Jarno Dmitry V. Levin 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 . */ -#ifndef _IO_STDIO_H +#ifndef _BITS_LIBIO_LDBL_H +#define _BITS_LIBIO_LDBL_H 1 + +#ifndef _BITS_LIBIO_H # error "Never include directly; use instead." #endif __LDBL_REDIR_DECL (_IO_vfscanf) __LDBL_REDIR_DECL (_IO_vfprintf) + +#endif -- cgit 1.4.1