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 972A33835C23 for ; Mon, 16 May 2022 15:53:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 972A33835C23 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-00037B-QZ 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-000FjJ-NX 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 6964A4800D3 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 cS7wEnejkbVm 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 1D8C3480075 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 f18OCGNkvJEF 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 EE3744800BE for ; Mon, 16 May 2022 17:53:32 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH v3 3/7] Optional struct _reent::__unused_sdidinit Date: Mon, 16 May 2022 17:53:25 +0200 Message-Id: <20220516155329.29458-4-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 __unused_sdidinit in _reserved_0. Provide it= only if _REENT_BACKWARD_BINARY_COMPAT is defined. --- newlib/libc/include/sys/reent.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/re= ent.h index fa9ac57da..fc289b531 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -342,6 +342,12 @@ struct _rand48 { #define _REENT_ASCTIME_SIZE 26 #define _REENT_SIGNAL_SIZE 24 =20 +#ifdef _REENT_BACKWARD_BINARY_COMPAT +#define _REENT_INIT_RESERVED_0 0, +#else +#define _REENT_INIT_RESERVED_0 /* Nothing to initialize */ +#endif + /* * struct _reent * @@ -395,9 +401,9 @@ struct _reent =20 char *_emergency; =20 - /* No longer used, but member retained for binary compatibility. - Now, the __cleanup member is used to check initialization. */ - int _unused_sdidinit; +#ifdef _REENT_BACKWARD_BINARY_COMPAT + int _reserved_0; +#endif =20 int _unspecified_locale_info; /* unused, reserved for locale stuff */ struct __locale_t *_locale;/* per-thread locale */ @@ -440,7 +446,7 @@ struct _reent &__sf[2], \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_RESERVED_0 \ 0, \ _NULL, \ _NULL, \ @@ -478,7 +484,7 @@ extern const struct __sFILE_fake __sf_fake_stderr; (__FILE *)&__sf_fake_stderr, \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_RESERVED_0 \ 0, \ _NULL, \ _NULL, \ @@ -633,9 +639,9 @@ struct _reent int _unspecified_locale_info; /* unused, reserved for locale stuff */ struct __locale_t *_locale;/* per-thread locale */ =20 - /* No longer used, but member retained for binary compatibility. - Now, the __cleanup member is used to check initialization. */ - int _unused_sdidinit; +#ifdef _REENT_BACKWARD_BINARY_COMPAT + int _reserved_0; +#endif =20 void (*__cleanup) (struct _reent *); =20 @@ -723,7 +729,7 @@ struct _reent "", \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_RESERVED_0 \ _NULL, \ _NULL, \ 0, \ --=20 2.35.3