From patchwork Wed Oct 2 18:20:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 34795 Received: (qmail 91011 invoked by alias); 2 Oct 2019 18:25:11 -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 90939 invoked by uid 89); 2 Oct 2019 18:25:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1310, HContent-Transfer-Encoding:8bit X-HELO: esa3.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1570040709; x=1601576709; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lo4IPDzB4wSvyN6GD+rm5gBwWldXCD+R+nEW79EmEKo=; b=CUYRdpxoPmwEcJgusZ66T8dPbnM8cbcuB0oQiWCN+2eQkPgfbVuOF1bs Hj6KvnSTVbPOvE/RdxtqjBnWaiATc2cio8k2I8L0u2PLAsLyjsfP9cp9G zwKeGwFv8uNuEEDztMY/fx/5Da1aLyop6RYSs01rLyIZl09JZk+Oau+4F zKCg2ucr2FZmTjmY7yHPa/tfRA8wXjbrjZPWCdM4FWmdcsxFx5Kg1FVM9 hStH8vxTblYvYftUmsUM/YQsvglEeHHq30zikmzAAK8nlaqMpmzvcyBYt qSXYlhs7Z+Cnkhznab4WiTWtIsH22Pjy/nDxJDqjV/OXgu5RNqPuh4Xmt A==; IronPort-SDR: SPt3p8FobiyqiuK8/kw6snfKSJc7bVPeliZbUqeUXnhhFZ1igw2E1EUnQBfRS0xdfuyPG4+3/v Wm8xZEXFkczv6r3NZ3PIc1Se26LcCBD4cN1zez8o27ALXnzM1R+v2w3ulwx36zr+yT9HRSUfdh EeHAJS40vK7WHIOkLTmdIDp1udZLjNQrqSZO4bQgp/Nrc1Gk5slneGFxsccN6oFfVEw1qwWJb0 GqvOslts2Wsk9NnvTyWtGqCPU469hCyzgYIfVRR1oSdTltdWEzWwXbhJYIwxa71bd8pXcsdJtp 6FQ= IronPort-SDR: rrT18oghmqtHFnf4jJqewY4+SAnF2cKTNufCd7rVdib0LedDcDkPi3mbAgMKYlGd5mbztIr6sw RIPSRdLQJ0PkJK7dbwbJsEbIV3AMpcKdTgYpc1YK/TaiTZh3vTxWQJiZ/x8qSb3lcmGswDr5nM +/KLInuXfvPNMoDC1wGjStkKjXd0GpRqepQ1F3IaV+2EDqituopUPl9ecA1dAB90Achh0diAQ4 kvDc5SlupL3DAyZcTtNw6p8iAVBQwflJTwLbqwoRcX2Gh+gI6zgxX2pqKGdP1ACq5mzWQlzswO 2wwuDHkmBosxKxHE/XQ4Ea7I IronPort-SDR: UoU93M553BLny7ajG7oyMMYeXOKrERBJvuz8joatNvAkJYXONmAPgn3Hr9QsIOn/AQmEkk1Ynd Z9Rse2y9ffO2mArQjum0kLWenPvUlGyx2sK3B4c9Ym75ep8Qu1UBt2XcmYfOX1kDRJnR7CYg6Y C37DgMaIH26iXfR09OIdMwWu0mdx672n9dLhcXH/O6jw6jo87I3maUL4yUr3IfE4u4+pSUl0tY J/DBv2gVLTovN95uYJE3wvT0Ae/TMNAvw8BV9cKujUTRnK1ou6LHoLg/mzNB5Ey/90TXZ3ezgu sCc= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH] string/endian.h: Restore the __USE_MISC conditionals Date: Wed, 2 Oct 2019 11:20:38 -0700 Message-Id: <20191002182038.29299-1-alistair.francis@wdc.com> MIME-Version: 1.0 Commit 69fd157a3 "time: Add padding for the timespec if required" caused a breakage in the glibc tests as the endian.h include file was kept in the networking headers while the __USE_MISC #ifdefs had been removed. This resulted in namespace violations in the networking headers. This patche restores the __USE_MISC conditionals in endian.h to fix the test failures. * string/endian.h: Restore the __USE_MISC conditionals. --- string/endian.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/string/endian.h b/string/endian.h index 0eb534e434b..1a9fe3c97e7 100644 --- a/string/endian.h +++ b/string/endian.h @@ -23,12 +23,14 @@ /* Get the definitions of __*_ENDIAN, __BYTE_ORDER, and __FLOAT_WORD_ORDER. */ #include -#define LITTLE_ENDIAN __LITTLE_ENDIAN -#define BIG_ENDIAN __BIG_ENDIAN -#define PDP_ENDIAN __PDP_ENDIAN -#define BYTE_ORDER __BYTE_ORDER +#ifdef __USE_MISC +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# define BIG_ENDIAN __BIG_ENDIAN +# define PDP_ENDIAN __PDP_ENDIAN +# define BYTE_ORDER __BYTE_ORDER +#endif -#ifndef __ASSEMBLER__ +#if defined __USE_MISC && !defined __ASSEMBLER__ /* Conversion interfaces. */ # include # include