From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <aoliva@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2140)
 id 833123850411; Fri, 18 Dec 2020 14:46:58 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 833123850411
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc(refs/users/aoliva/heads/testme)] Account for VxWorks headers in
 libstdc++ test on names
X-Act-Checkin: gcc
X-Git-Author: Olivier Hainque <hainque@adacore.com>
X-Git-Refname: refs/users/aoliva/heads/testme
X-Git-Oldrev: 5eb77b3ee2d21907a9d40d477b6b6e5d8770debe
X-Git-Newrev: 76917cbb7d7b2a095563e9e56f19677281e734df
Message-Id: <20201218144658.833123850411@sourceware.org>
Date: Fri, 18 Dec 2020 14:46:58 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Dec 2020 14:46:58 -0000

https://gcc.gnu.org/g:76917cbb7d7b2a095563e9e56f19677281e734df

commit 76917cbb7d7b2a095563e9e56f19677281e734df
Author: Olivier Hainque <hainque@adacore.com>
Date:   Fri Dec 18 11:39:36 2020 -0300

    Account for VxWorks headers in libstdc++ test on names
    
    Undefine various macros unexpectedly defined by VxWorks headers.
    
    
    for  libstdc++-v3/ChangeLog
    
            * testsuite/17_intro/names.cc: Account for VxWorks headers.

Diff:
---
 libstdc++-v3/testsuite/17_intro/names.cc | 41 ++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 2c8bfff26e1..4760a9efd79 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -211,4 +211,45 @@
 #undef ptr
 #endif
 
+#ifdef __VXWORKS__
+
+#include <_vxworks-versions.h>
+
+// Some VxWorks 6 or 7 headers are using those.
+
+// private/objLibP.h
+#undef u
+
+// arch/ppc/ffs/ArchLib.h
+#undef i
+#undef j
+
+// math.h
+#undef x
+#undef y
+
+// stdio.h
+#undef ptr
+
+// VxWorks >= 7 specificities
+
+#if _VXWORKS_MAJOR_GE(7)
+
+// regs.h regs structure has a field 'r'
+#undef r
+
+#ifndef __RTP__
+// in bootLib.h, bootParamCheck has parameters x, a-f
+#undef a
+#undef b
+#undef c
+#undef d
+#undef e
+#undef f
+#endif // __RTP__
+
+#endif // VxWorks Major >= 7
+
+#endif // __VXWORKS__
+
 #include <bits/stdc++.h>