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 <m...@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.