From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id 4D5143858284; Sat, 24 Dec 2022 12:25:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4D5143858284 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nefkom.net Received: from frontend03.mail.m-online.net (unknown [192.168.6.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4NfNYf0l3Rz1r1NP; Sat, 24 Dec 2022 13:25:41 +0100 (CET) Received: from localhost (dynscan3.mnet-online.de [192.168.6.84]) by mail.m-online.net (Postfix) with ESMTP id 4NfNYd5lsBz1qqlR; Sat, 24 Dec 2022 13:25:41 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan3.mail.m-online.net [192.168.6.84]) (amavisd-new, port 10024) with ESMTP id QPfPAfWpQHfs; Sat, 24 Dec 2022 13:25:41 +0100 (CET) X-Auth-Info: cAxLel1I7tpk0x2Rz0rMMQNyWVJfs3BKxuP2cfKvFkNd4XFRSb0pDfLDfncoXqjz Received: from igel.home (aftr-62-216-205-97.dynamic.mnet-online.de [62.216.205.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Sat, 24 Dec 2022 13:25:41 +0100 (CET) Received: by igel.home (Postfix, from userid 1000) id B6EC32C14F0; Sat, 24 Dec 2022 13:25:40 +0100 (CET) From: Andreas Schwab To: Iain Sandoe via Gcc-patches Cc: libstdc++@gcc.gnu.org, iain@sandoe.co.uk, Iain Sandoe Subject: Re: [PATCH] libstdc++: Test for tzdata.zi before fallback version files. References: <20221224114009.20261-1-iain@sandoe.co.uk> X-Yow: Hello, GORRY-O!! I'm a GENIUS from HARVARD!! Date: Sat, 24 Dec 2022 13:25:40 +0100 In-Reply-To: <20221224114009.20261-1-iain@sandoe.co.uk> (Iain Sandoe via Gcc-patches's message of "Sat, 24 Dec 2022 11:40:09 +0000") Message-ID: <87wn6hounv.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Dez 24 2022, Iain Sandoe via Gcc-patches wrote: > @@ -1083,6 +1078,14 @@ namespace std::chrono > if (*zif >> hash >> label >> version) > if (hash == '#' && label == "version") > return version; > +#if defined __NetBSD__ > + if (string ver; ifstream(zoneinfo_dir() + "/TZDATA_VERSION") >> ver) > + return ver; > +#elif defined __APPLE__ > + // The standard install on macOS has no tzdata.zi, but we can find the > + // version from +VERSION. > + if (string ver; ifstream(zoneinfo_dir() + "/+VERSION") >> ver) > + return ver; > #endif > __throw_runtime_error("tzdb: no version found in tzdata.zi"); > } Looks like indentation is off here. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."