From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 31 Aug 2021 09:25:53 +0000 (+0100)
Subject: libstdc++: Fix 17_intro/names.cc failures on Solaris
X-Git-Tag: releases/gcc-11.3.0~758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8e37478914884d88c800cf23cf882521f587c04;p=thirdparty%2Fgcc.git

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.

(cherry picked from commit 69b09c5599b201ac039db564c303f7b20d87e0df)
---

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 624e3ed9ccfe..226b2d9c24aa 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -217,6 +217,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