From 229433c94f80752955908498be55c1ed017d8fa7 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 16 Jan 2018 20:40:09 +0000 Subject: [PATCH] * testsuite/17_intro/names.cc: Undefine 'y' on SPARC/Linux. From-SVN: r256754 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/testsuite/17_intro/names.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 308a7f35501..e5614460b8e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2018-01-16 Eric Botcazou + + * testsuite/17_intro/names.cc: Undefine 'y' on SPARC/Linux. + 2018-01-16 Jonathan Wakely PR libstdc++/83834 diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 8781e441720..4e6cff1fe37 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -112,4 +112,8 @@ #undef r #endif +#if defined (__linux__) && defined (__sparc__) +#undef y +#endif + #include -- 2.30.2