From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id D71DF3857BB4 for ; Fri, 10 Jun 2022 21:42:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D71DF3857BB4 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=mentovai.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentovai.com Received: by mail-pl1-x634.google.com with SMTP id n18so307463plg.5 for ; Fri, 10 Jun 2022 14:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mentovai.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QDXVVyUA6mTZPBTjAb3tDAD0rJtQspYd4Wd+9aLQr2c=; b=WdxjhAmK72n8NSP+TxD2cFLnhP8lGKjJNkcevMULF+QNPYtBvgP+k7rBcLWFOL29JQ mlKZS+QWLzAcRX0YphePCr7B9dqyyZ0VMmFoTR6q0yRaCQWqxEwLBDtRAVCJEGkzuHQI S/0FOh3Z5YNxhJuuXu43AVehyyToCZEngBd3w= 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=QDXVVyUA6mTZPBTjAb3tDAD0rJtQspYd4Wd+9aLQr2c=; b=YIW6suMijNF0D6oubNJv/McH4AcbjjjQ/gPk1nk0XLXfnWpC9DbWXK/g6sSLR4Fmau fucSzqVezJXjp1iXJQB6VMWHLElwRFyV26fKxuymI8VpVWAWRas8gpxuXW1JrlTUakqH 3F7HrcZyeaV3esUjSJIeG9Fqp6aVciAIu5EBgeKMRPw4rJzNIOfzs8TlunXIv8NxM3cf ZktMRGAU9ApcAZH2jqg8XCylsW31xwSPXBhawmKkiimKRtNjKSxpQAGcnLjb0VZCKDGh 3uCA/1MdtSSMHBeQZD0pQJWeml1vMl9pIu/pRfhrY55BTyookco6idrk82+8voLemBq4 JXwA== X-Gm-Message-State: AOAM531iHGr+19qc4uwcbiiEMhUwJumvg8l3iMIIV5c6b9m2TrDHd8lr 2rbxcLoJKI8//4Btb57WtjOmE7ZY7kIML6RYj7gO6HV61Po= X-Google-Smtp-Source: ABdhPJwy7s8akF/wHfE5bFV8Y1KE6uNpsIQqoN8+E6aCE+pLImZmNIM1IeQrOyFl51rojvRjrjsR/thzIF+fPzjkcUY= X-Received: by 2002:a17:902:ec91:b0:167:6f74:ba73 with SMTP id x17-20020a170902ec9100b001676f74ba73mr31828015plg.141.1654897344201; Fri, 10 Jun 2022 14:42:24 -0700 (PDT) MIME-Version: 1.0 References: <20220610201145.34747-1-mark@mentovai.com> In-Reply-To: From: Mark Mentovai Date: Fri, 10 Jun 2022 17:42:12 -0400 Message-ID: Subject: Re: [PATCH] libstdc++: Rename __null_terminated to avoid collision with Apple SDK To: Jonathan Wakely Cc: gcc Patches , "libstdc++" , Iain Sandoe X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, HTML_MESSAGE, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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:42:38 -0000 Thanks, Jonathan. I am, in fact, so certifying. I do believe that bringing up support for new OS versions is in scope for open branches, and it makes sense to merge, particularly for a trivial and uncontentious patch like this one. Jonathan Wakely wrote: > 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. > >