From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 22 May 2025 14:23:10 +0000 (+0100)
Subject: libstdc++: Fix 17_intro/names.cc failure on Solaris 11.3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209353632da0e9f9600ba1c54fdfd88477fb48d0;p=thirdparty%2Fgcc.git

libstdc++: Fix 17_intro/names.cc failure on Solaris 11.3

There are some names in Solaris libc headers which cause:

FAIL: 17_intro/names.cc  -std=gnu++98 (test for excess errors)
FAIL: 17_intro/names.cc  -std=gnu++11 (test for excess errors)

libstdc++-v3/ChangeLog:

	* testsuite/17_intro/names.cc [__sun__] (a, i, n): Undefine.
---

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index f67818db425..0e67c795564 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -323,6 +323,7 @@
 
 #ifdef __sun__
 // <fenv.h> defines these as members of fex_numeric_t
+#undef i
 #undef l
 #undef f
 #undef d
@@ -332,8 +333,11 @@
 #undef ptr
 // <sys/timespec_util.h> uses this as parameter
 #undef r
-// <stdlib.h> uses this as member of drand48_data
+// <stdlib.h> uses these as members of drand48_data
+#undef a
 #undef x
+// <string.h> defines this as a parameter of timingsafe_memcmp
+#undef n
 #endif
 
 #ifdef __VXWORKS__