diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-12-31 08:50:34 -0800 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-12-31 08:57:32 -0800 |
| commit | 4f820792a6217027744d38fc223257914847bbcc (patch) | |
| tree | 9a5ceb2e592590ad1718e3db16f3c8445d3a1feb | |
| parent | 3e3c904daef69b8bf7d5cc07f793c9f07c3553ef (diff) | |
| download | glibc-4f820792a6217027744d38fc223257914847bbcc.tar.gz glibc-4f820792a6217027744d38fc223257914847bbcc.tar.xz glibc-4f820792a6217027744d38fc223257914847bbcc.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libio/bits/libio-ldbl.h | 7 |
2 files changed, 11 insertions, 1 deletions
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 |