From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C02153857BB4 for ; Fri, 10 Jun 2022 21:22:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C02153857BB4 Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-600-qyDD9QnuPKCadR6G9HE5xQ-1; Fri, 10 Jun 2022 17:22:09 -0400 X-MC-Unique: qyDD9QnuPKCadR6G9HE5xQ-1 Received: by mail-yb1-f199.google.com with SMTP id a68-20020a25ca47000000b006605f788ff1so329048ybg.16 for ; Fri, 10 Jun 2022 14:22:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Wsp/VfOP7tVC+8z9ZIPWrZ6hcNhJk0qfbGVjCKk2GlE=; b=fAL/+Q2dQY4u9IxekelPX+7R0wgKdenvI/UiHBQnfVNfC522gSvXsyPQbGIveS0VzU 3mEcNb3KJgInOYoYVXP3tOBN+rlnBGn0Ieh5o1moHHTsDiAlPV7Jl4IrGFHbakmQHhlF ZPwroLlGtdZyz84kkGA89B3H5ZP6n+6JqbEK3G2ScY2memgMRxRCl+j8Zp5fBh0zU0JV yZrZ91fk3IMTyx1SFf+UGkKSGwqgyZ2BMip22pRLYT93lgx7YMthCP1i0nKkHinAIVWV RLmINT6rWfzyMx6ps6LVs5g0HVbR66mS9ibBLq9NE2qOmsETmqTPOEjQxtXdxRYfy79R 4Cng== X-Gm-Message-State: AOAM531V7AlGQLhrbxykbwJTOQS0daa86QbsBNMzYZy1UVwDmOQRE1Na FNC9NvQlyj8zUvX8sW16KUzM3RuggTwapl2YksN4bG7le47YD0PQi2Bd03DT73Y7E7iRWNkkJiR hkn+bSYjiK8dRV4/riypsCcQq2AHatO8= X-Received: by 2002:a81:77c5:0:b0:313:cfb0:ba3f with SMTP id s188-20020a8177c5000000b00313cfb0ba3fmr2311767ywc.450.1654896128830; Fri, 10 Jun 2022 14:22:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweM8GPumt4iGr+TGRAS3eB9OskaVNFohA1pWh9slTiRWk8vckMhrvBLu12i52Bt9RtAfr3F89Q8GX64RWU4W8= X-Received: by 2002:a81:77c5:0:b0:313:cfb0:ba3f with SMTP id s188-20020a8177c5000000b00313cfb0ba3fmr2311733ywc.450.1654896128441; Fri, 10 Jun 2022 14:22:08 -0700 (PDT) MIME-Version: 1.0 References: <20220610201145.34747-1-mark@mentovai.com> In-Reply-To: <20220610201145.34747-1-mark@mentovai.com> From: Jonathan Wakely Date: Fri, 10 Jun 2022 22:21:57 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Rename __null_terminated to avoid collision with Apple SDK To: Mark Mentovai Cc: gcc Patches , "libstdc++" , Iain Sandoe X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2022 21:22:15 -0000 On Fri, 10 Jun 2022 at 21:12, Mark Mentovai wrote: > > The macOS 13 SDK (and equivalent-version iOS and other Apple OS SDKs) > contain this definition in : > > 863 #define __null_terminated > > This collides with the use of __null_terminated in libstdc++'s > experimental fs_path.h. > > As libstdc++'s use of this token is entirely internal to fs_path.h, the > simplest workaround, renaming it, is most appropriate. Here, it's > renamed to __nul_terminated, referencing the NUL ('\0') value that is > used to terminate the strings in the context in which this tag structure > is used. > > libstdc++-v3/ChangeLog: > > * include/experimental/bits/fs_path.h: Rename __null_terminated > to __nul_terminated avoid colliding with a macro in Apple's SDK. > > Signed-off-by: Mark Mentovai Thanks for the patch. The change makes sense so I'll get it committed. Is this change needed on the release branches too? Just to be sure, could you please confirm that your Signed-off-by: tag is to certify you agree with the DCO at https://gcc.gnu.org/dco.html (and not just something you're doing because you've seen others doing it :-) Thanks again.