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 5B6493838008 for ; Tue, 10 May 2022 08:09:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5B6493838008 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 sslproxy06.your-server.de ([78.46.172.3]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1noKw6-000Mq2-Sx for newlib@sourceware.org; Tue, 10 May 2022 10:09:39 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy06.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1noKw7-000H6K-0t for newlib@sourceware.org; Tue, 10 May 2022 10:09:39 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id BA18D48015F for ; Tue, 10 May 2022 10:09:38 +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 JYeSt5Ns5DqO; Tue, 10 May 2022 10:09:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 7E4F64800B0; Tue, 10 May 2022 10:09:38 +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 oFI6zDtlBlel; Tue, 10 May 2022 10:09:38 +0200 (CEST) Received: from joyce-tux.eb.localhost (unknown [10.10.171.30]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 22F1B48013D; Tue, 10 May 2022 10:09:38 +0200 (CEST) From: Matthew Joyce To: newlib@sourceware.org Subject: [PATCH 03/11] Declare global __sf[] only once Date: Tue, 10 May 2022 10:09:19 +0200 Message-Id: <20220510080927.28839-4-matthew.joyce@embedded-brains.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220510080927.28839-1-matthew.joyce@embedded-brains.de> References: <20220510080927.28839-1-matthew.joyce@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/26536/Mon May 9 10:04:57 2022) X-Spam-Status: No, score=-11.6 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Tue, 10 May 2022 08:09:41 -0000 From: Sebastian Huber Reduced number of global __sf[] declarations from two to one, simplifying initializations in sys/reent.h. --- newlib/libc/include/sys/reent.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/re= ent.h index 4bc78a447..e0b0ccffb 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -293,6 +293,10 @@ typedef struct __sFILE __FILE; #endif /* __LARGE64_FILES */ #endif /* !__CUSTOM_FILE_IO__ */ =20 +#ifdef _REENT_GLOBAL_STDIO_STREAMS +extern __FILE __sf[3]; +#endif + struct _glue { struct _glue *_next; @@ -426,7 +430,6 @@ struct _reent }; =20 #ifdef _REENT_GLOBAL_STDIO_STREAMS -extern __FILE __sf[3]; =20 # define _REENT_INIT(var) \ { 0, \ @@ -698,7 +701,6 @@ struct _reent }; =20 #ifdef _REENT_GLOBAL_STDIO_STREAMS -extern __FILE __sf[3]; #define _REENT_STDIO_STREAM(var, index) &__sf[index] #else #define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index] --=20 2.31.1