]> git.ipfire.org Git - thirdparty/gcc.git/commit
libstdc++: Rename __null_terminated to avoid collision with Apple SDK
authorMark Mentovai <mark@mentovai.com>
Mon, 13 Jun 2022 15:40:19 +0000 (16:40 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Mon, 13 Jun 2022 19:25:49 +0000 (20:25 +0100)
commit254e88b3d7e8abcc236be3451609834371cf4d5d
treea3c2a1bb7ebe557f2679d7071566a92aeeec5244
parent30cc1b65e4efa1a2c57fec5574fcae7a446b822f
libstdc++: Rename __null_terminated to avoid collision with Apple SDK

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 (__detail::__null_terminated):
Rename to __nul_terminated to avoid colliding with a macro in
Apple's SDK.

Signed-off-by: Mark Mentovai <mark@mentovai.com>
libstdc++-v3/include/experimental/bits/fs_path.h