aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2025-05-27 12:54:14 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2025-05-27 13:35:23 +0100
commitd1ced2a5ea6b09ad54ad927f90ccc8047cb74e19 (patch)
tree0005d972284209cbdb1465a5bde216147d980e2b
parent7fa1bd660a8a501671a84ca6421db1fc63ce8654 (diff)
downloadgcc-d1ced2a5ea6b09ad54ad927f90ccc8047cb74e19.zip
gcc-d1ced2a5ea6b09ad54ad927f90ccc8047cb74e19.tar.gz
gcc-d1ced2a5ea6b09ad54ad927f90ccc8047cb74e19.tar.bz2
libstdc++: Fix some names.cc test failures on AIX
libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc [_AIX] (n): Undefine. * testsuite/experimental/names.cc [_AIX] (ptr): Undefine.
-rw-r--r--libstdc++-v3/testsuite/17_intro/names.cc2
-rw-r--r--libstdc++-v3/testsuite/experimental/names.cc6
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 0e67c79..a61e49d 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -248,6 +248,8 @@
#undef r
#undef x
#undef y
+// <sys/localedef.h> defines _LC_weight_t::n
+#undef n
// <sys/poll.h> defines pollfd_ext::u on AIX 7.3
#undef u
// <sys/var.h> defines vario::v
diff --git a/libstdc++-v3/testsuite/experimental/names.cc b/libstdc++-v3/testsuite/experimental/names.cc
index e0a7d4f..4bedd53 100644
--- a/libstdc++-v3/testsuite/experimental/names.cc
+++ b/libstdc++-v3/testsuite/experimental/names.cc
@@ -22,6 +22,12 @@
// naming variables, parameters etc. in the library.
#include "../17_intro/names.cc"
+
+#ifdef _AIX
+// <netdb.h> declares endnetgrent_r with ptr parameter.
+# undef n
+#endif
+
// Filesystem
#if __has_include(<experimental/filesystem>)
# include <experimental/filesystem>