From 69ba2dc5dcc21781f8f7f4410c02fe093048edd0 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 14 Mar 2017 20:50:16 +0000
Subject: [PATCH] Fix libstdc++ reserved names test to pass on AIX

	* testsuite/17_intro/names.cc: Undefine macros that clash with
	identifiers in AIX system headers.

From-SVN: r246143
---
 libstdc++-v3/ChangeLog                   | 5 +++++
 libstdc++-v3/testsuite/17_intro/names.cc | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 50af6a14a50e..01446915800a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-14  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/17_intro/names.cc: Undefine macros that clash with
+	identifiers in AIX system headers.
+
 2017-03-13  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	PR libstdc++/80034
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index a7d9a6bced34..c52586156630 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -98,4 +98,13 @@
 #define x (
 #define y (
 #define z (
+
+#ifdef _AIX
+// See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html
+#undef f
+#undef r
+#undef x
+#undef y
+#endif
+
 #include <bits/stdc++.h>
-- 
2.47.2