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 9E7273886C46 for ; Mon, 16 May 2022 15:53:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9E7273886C46 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 sslproxy01.your-server.de ([78.46.139.224]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nqd2L-00037H-VI for newlib@sourceware.org; Mon, 16 May 2022 17:53:33 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy01.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nqd2L-000FkF-Sv for newlib@sourceware.org; Mon, 16 May 2022 17:53:33 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 91763480167 for ; Mon, 16 May 2022 17:53:33 +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 6-WrhywdsxCT for ; Mon, 16 May 2022 17:53:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 3A6DA48017C for ; Mon, 16 May 2022 17:53:33 +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 RK7bWQUHicWj for ; Mon, 16 May 2022 17:53:33 +0200 (CEST) Received: from zimbra.eb.localhost (unknown [192.168.96.242]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 0845D4800F3 for ; Mon, 16 May 2022 17:53:33 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH v3 4/7] Optional struct _reent::_unspecified_locale_info Date: Mon, 16 May 2022 17:53:26 +0200 Message-Id: <20220516155329.29458-5-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220516155329.29458-1-sebastian.huber@embedded-brains.de> References: <20220516155329.29458-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/26543/Mon May 16 10:03:34 2022) X-Spam-Status: No, score=-11.5 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: Mon, 16 May 2022 15:53:37 -0000 Rename struct _reent member _unspecified_locale_info in _reserved_1. Pro= vide it only if _REENT_BACKWARD_BINARY_COMPAT is defined. --- newlib/libc/include/sys/reent.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/re= ent.h index fc289b531..f526f3568 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -344,8 +344,10 @@ struct _rand48 { =20 #ifdef _REENT_BACKWARD_BINARY_COMPAT #define _REENT_INIT_RESERVED_0 0, +#define _REENT_INIT_RESERVED_1 0, #else #define _REENT_INIT_RESERVED_0 /* Nothing to initialize */ +#define _REENT_INIT_RESERVED_1 /* Nothing to initialize */ #endif =20 /* @@ -403,9 +405,8 @@ struct _reent =20 #ifdef _REENT_BACKWARD_BINARY_COMPAT int _reserved_0; + int _reserved_1; #endif - - int _unspecified_locale_info; /* unused, reserved for locale stuff */ struct __locale_t *_locale;/* per-thread locale */ =20 struct _mprec *_mp; @@ -447,7 +448,7 @@ struct _reent 0, \ _NULL, \ _REENT_INIT_RESERVED_0 \ - 0, \ + _REENT_INIT_RESERVED_1 \ _NULL, \ _NULL, \ _NULL, \ @@ -485,7 +486,7 @@ extern const struct __sFILE_fake __sf_fake_stderr; 0, \ _NULL, \ _REENT_INIT_RESERVED_0 \ - 0, \ + _REENT_INIT_RESERVED_1 \ _NULL, \ _NULL, \ _NULL, \ @@ -635,8 +636,9 @@ struct _reent int _inc; /* used by tmpnam */ char _emergency[_REENT_EMERGENCY_SIZE]; =20 - /* TODO */ - int _unspecified_locale_info; /* unused, reserved for locale stuff */ +#ifdef _REENT_BACKWARD_BINARY_COMPAT + int _reserved_1; +#endif struct __locale_t *_locale;/* per-thread locale */ =20 #ifdef _REENT_BACKWARD_BINARY_COMPAT @@ -727,7 +729,7 @@ struct _reent _REENT_STDIO_STREAM(&(var), 2), \ 0, \ "", \ - 0, \ + _REENT_INIT_RESERVED_1 \ _NULL, \ _REENT_INIT_RESERVED_0 \ _NULL, \ --=20 2.35.3