public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Mark Mentovai <mark@mentovai.com>
To: Jonathan Wakely <jwakely@redhat.com>
Cc: gcc Patches <gcc-patches@gcc.gnu.org>,
	"libstdc++" <libstdc++@gcc.gnu.org>,
	Iain Sandoe <iain@sandoe.co.uk>
Subject: Re: [PATCH] libstdc++: Rename __null_terminated to avoid collision with Apple SDK
Date: Fri, 10 Jun 2022 17:42:12 -0400	[thread overview]
Message-ID: <CAO5tm1tc0gVBisVXc=dqGj7NfNwdoKnoZiYoO3aBkcDoEOfJaw@mail.gmail.com> (raw)
In-Reply-To: <CACb0b4mZwveAEw2-xeUwZc_f=9rHEcY-fWhXjsrb6RM4Upj6qg@mail.gmail.com>

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 <sys/cdefs.h>:
> >
> > 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 <mark@mentovai.com>
>
> 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.
>
>

  reply	other threads:[~2022-06-10 21:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-10 20:11 Mark Mentovai
2022-06-10 21:21 ` Jonathan Wakely
2022-06-10 21:42   ` Mark Mentovai [this message]
2022-06-13 19:28     ` Jonathan Wakely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAO5tm1tc0gVBisVXc=dqGj7NfNwdoKnoZiYoO3aBkcDoEOfJaw@mail.gmail.com' \
    --to=mark@mentovai.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=iain@sandoe.co.uk \
    --cc=jwakely@redhat.com \
    --cc=libstdc++@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).