From patchwork Mon Mar 11 14:59:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 31815 Received: (qmail 123376 invoked by alias); 11 Mar 2019 15:17:22 -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 123136 invoked by uid 89); 11 Mar 2019 15:17:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=refers, HContent-Transfer-Encoding:8bit X-HELO: l2mail1.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH 8/8] =?UTF-8?q?Don=E2=80=99t=20conditionalize=20declaratio?= =?UTF-8?q?ns=20of=20ldiv=5Ft, =20lldiv=5Ft, =20=5F=5Fgwchar=5Ft.?= Date: Mon, 11 Mar 2019 10:59:52 -0400 Message-Id: <5bef1aa7abc2340c0edcb9d1553ae46c57ca2420.1552315664.git.zackw@panix.com> In-Reply-To: References: MIME-Version: 1.0 The declarations of ldiv_t, lldiv_t, and __gwchar_t are all wrapped in __foo_t_defined conditionals, despite there being only one header in glibc that declares them. I checked codesearch.debian.net and only found one other program that refers to the __foo_t_defined conditionals: u-boot provides its own definition of ldiv_t if __ldiv_t_defined is not defined by stdlib.h. I conclude that the conditionals are not necessary, but the definitions of __ldiv_t_defined and __lldiv_t_defined should be preserved. * stdlib/inttypes.h: Unconditionally define __gwchar_t. Don’t define ____gwchar_t_defined. * stdlib/stdlib.h: Unconditionally define ldiv_t. Condition lldiv_t only on __USE_ISOC99. --- stdlib/inttypes.h | 15 ++++++--------- stdlib/stdlib.h | 6 ++---- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/stdlib/inttypes.h b/stdlib/inttypes.h index ddcb171b09..c5fb12056e 100644 --- a/stdlib/inttypes.h +++ b/stdlib/inttypes.h @@ -27,17 +27,14 @@ #include /* Get a definition for wchar_t. But we must not define wchar_t itself. */ -#ifndef ____gwchar_t_defined -# ifdef __cplusplus -# define __gwchar_t wchar_t -# elif defined __WCHAR_TYPE__ +#ifdef __cplusplus +# define __gwchar_t wchar_t +#elif defined __WCHAR_TYPE__ typedef __WCHAR_TYPE__ __gwchar_t; -# else -# define __need_wchar_t -# include +#else +# define __need_wchar_t +# include typedef wchar_t __gwchar_t; -# endif -# define ____gwchar_t_defined 1 #endif # if __WORDSIZE == 64 diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 15debe1e31..5e5d966c6a 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -62,16 +62,14 @@ typedef struct } div_t; /* Returned by `ldiv'. */ -#ifndef __ldiv_t_defined typedef struct { long int quot; /* Quotient. */ long int rem; /* Remainder. */ } ldiv_t; -# define __ldiv_t_defined 1 -#endif +#define __ldiv_t_defined 1 -#if defined __USE_ISOC99 && !defined __lldiv_t_defined +#if defined __USE_ISOC99 /* Returned by `lldiv'. */ __extension__ typedef struct {