From patchwork Sun Dec 31 17:03:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 25165 Received: (qmail 101620 invoked by alias); 31 Dec 2017 17:03:30 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 101604 invoked by uid 89); 31 Dec 2017 17:03:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=HContent-Transfer-Encoding:8bit X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [COMMITTED] Correct improper-inclusion check in bits/libio-ldbl.h. Date: Sun, 31 Dec 2017 12:03:25 -0500 Message-Id: <20171231170325.15483-1-zackw@panix.com> MIME-Version: 1.0 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 + + * 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