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.

diff --git a/ChangeLog b/ChangeLog
index cd6fc15767a8dd0b5117d0910498b1f3406fd43d..75f1a1a14c1e6ec6e9da6b15906ac8d7b6de5c92 100644 (file)
--- 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 f238550e4b7e08e11fa78538650ef4ae1e24ccdb..b5fd97e35906cffd66cde9c4ed71606d296eeb66 100644 (file)
--- 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