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 56A27396D807 for ; Fri, 13 May 2022 13:47:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 56A27396D807 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-000A8M-GJ 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-000Osc-Kp 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 57538480190 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 oBj3K50KsMey 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 03EBA48017E 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 S8fpAUKKzFUG 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 D8CAE48018C for ; Fri, 13 May 2022 15:47:02 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH 3/7] Optional struct _reent::__unused_sdidinit Date: Fri, 13 May 2022 15:46:56 +0200 Message-Id: <20220513134700.68563-4-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.4 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::__unused_sdidinit only if _NEWLIB_BACKWARD_BINARY_= COMPAT is defined. --- newlib/libc/include/sys/reent.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/re= ent.h index fa9ac57da..6a1340b4f 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 _NEWLIB_BACKWARD_BINARY_COMPAT +#define _REENT_INIT_UNUSED_SDIDINIT 0, +#else +#define _REENT_INIT_UNUSED_SDIDINIT /* Nothing to initialize */ +#endif + /* * struct _reent * @@ -395,9 +401,11 @@ struct _reent =20 char *_emergency; =20 +#ifdef _NEWLIB_BACKWARD_BINARY_COMPAT /* 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 */ struct __locale_t *_locale;/* per-thread locale */ @@ -440,7 +448,7 @@ struct _reent &__sf[2], \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_UNUSED_SDIDINIT \ 0, \ _NULL, \ _NULL, \ @@ -478,7 +486,7 @@ extern const struct __sFILE_fake __sf_fake_stderr; (__FILE *)&__sf_fake_stderr, \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_UNUSED_SDIDINIT \ 0, \ _NULL, \ _NULL, \ @@ -633,9 +641,11 @@ struct _reent int _unspecified_locale_info; /* unused, reserved for locale stuff */ struct __locale_t *_locale;/* per-thread locale */ =20 +#ifdef _NEWLIB_BACKWARD_BINARY_COMPAT /* No longer used, but member retained for binary compatibility. Now, the __cleanup member is used to check initialization. */ int _unused_sdidinit; +#endif =20 void (*__cleanup) (struct _reent *); =20 @@ -723,7 +733,7 @@ struct _reent "", \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_UNUSED_SDIDINIT \ _NULL, \ _NULL, \ 0, \ --=20 2.35.3