aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-08-31 10:25:53 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-08-31 14:17:53 +0100
commit69b09c5599b201ac039db564c303f7b20d87e0df (patch)
treee741d8b255a61fd1ccc0ce3727495b1b3e866f9d
parentcad36f38576a6a781e3c62ab061c68f5b8dab13a (diff)
downloadgcc-69b09c5599b201ac039db564c303f7b20d87e0df.zip
gcc-69b09c5599b201ac039db564c303f7b20d87e0df.tar.gz
gcc-69b09c5599b201ac039db564c303f7b20d87e0df.tar.bz2
libstdc++: Fix 17_intro/names.cc failures on Solaris
Signed-off-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc: Undefine some more names used by Solaris system headers.
-rw-r--r--libstdc++-v3/testsuite/17_intro/names.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index b945511..b5e926f 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -243,6 +243,12 @@
#endif
#ifdef __sun__
+// <fenv.h> defines these as members of fex_numeric_t
+#undef l
+#undef f
+#undef d
+#undef q
+#undef p
// See https://gcc.gnu.org/ml/libstdc++/2019-05/msg00175.html
#undef ptr
#endif