From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id 544FB396D805 for ; Fri, 13 May 2022 13:47:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 544FB396D805 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de Received: from sslproxy02.your-server.de ([78.47.166.47]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1npVdH-000A8c-Mt for newlib@sourceware.org; Fri, 13 May 2022 15:47:03 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1npVdH-000OuC-Rb for newlib@sourceware.org; Fri, 13 May 2022 15:47:03 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 8FE9F48018C for ; Fri, 13 May 2022 15:47:03 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id uUhhTF0V_ruO for ; Fri, 13 May 2022 15:47:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 214EC480181 for ; Fri, 13 May 2022 15:47:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id bWiUmSY8Jnxd for ; Fri, 13 May 2022 15:47:02 +0200 (CEST) Received: from zimbra.eb.localhost (unknown [192.168.96.242]) by mail.embedded-brains.de (Postfix) with ESMTPSA id DCF2048018E for ; Fri, 13 May 2022 15:47:02 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH 4/7] Optional struct _reent::_unspecified_locale_info Date: Fri, 13 May 2022 15:46:57 +0200 Message-Id: <20220513134700.68563-5-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220513134700.68563-1-sebastian.huber@embedded-brains.de> References: <20220513134700.68563-1-sebastian.huber@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.5/26540/Fri May 13 10:03:59 2022) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 13:47:06 -0000 Provide struct _reent::_unspecified_locale_info only if _NEWLIB_BACKWARD_BINARY_COMPAT is defined. --- newlib/libc/include/sys/reent.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/re= ent.h index 6a1340b4f..96fa94bd7 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -343,8 +343,10 @@ struct _rand48 { #define _REENT_SIGNAL_SIZE 24 =20 #ifdef _NEWLIB_BACKWARD_BINARY_COMPAT +#define _REENT_INIT_UNUSED_LOCALE_INFO 0, #define _REENT_INIT_UNUSED_SDIDINIT 0, #else +#define _REENT_INIT_UNUSED_LOCALE_INFO /* Nothing to initialize */ #define _REENT_INIT_UNUSED_SDIDINIT /* Nothing to initialize */ #endif =20 @@ -405,9 +407,9 @@ struct _reent /* No longer used, but member retained for binary compatibility. Now, the __cleanup member is used to check initialization. */ int _unused_sdidinit; -#endif =20 int _unspecified_locale_info; /* unused, reserved for locale stuff */ +#endif struct __locale_t *_locale;/* per-thread locale */ =20 struct _mprec *_mp; @@ -449,7 +451,7 @@ struct _reent 0, \ _NULL, \ _REENT_INIT_UNUSED_SDIDINIT \ - 0, \ + _REENT_INIT_UNUSED_LOCALE_INFO \ _NULL, \ _NULL, \ _NULL, \ @@ -487,7 +489,7 @@ extern const struct __sFILE_fake __sf_fake_stderr; 0, \ _NULL, \ _REENT_INIT_UNUSED_SDIDINIT \ - 0, \ + _REENT_INIT_UNUSED_LOCALE_INFO \ _NULL, \ _NULL, \ _NULL, \ @@ -638,7 +640,9 @@ struct _reent char _emergency[_REENT_EMERGENCY_SIZE]; =20 /* TODO */ +#ifdef _NEWLIB_BACKWARD_BINARY_COMPAT int _unspecified_locale_info; /* unused, reserved for locale stuff */ +#endif struct __locale_t *_locale;/* per-thread locale */ =20 #ifdef _NEWLIB_BACKWARD_BINARY_COMPAT @@ -731,7 +735,7 @@ struct _reent _REENT_STDIO_STREAM(&(var), 2), \ 0, \ "", \ - 0, \ + _REENT_INIT_UNUSED_LOCALE_INFO \ _NULL, \ _REENT_INIT_UNUSED_SDIDINIT \ _NULL, \ --=20 2.35.3