public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-6327] Account for VxWorks headers in libstdc++ test on names
@ 2020-12-23 23:30 Alexandre Oliva
  0 siblings, 0 replies; only message in thread
From: Alexandre Oliva @ 2020-12-23 23:30 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

https://gcc.gnu.org/g:eb81c997d81033407576a2376b6ce24b0646d3a1

commit r11-6327-geb81c997d81033407576a2376b6ce24b0646d3a1
Author: Olivier Hainque <hainque@adacore.com>
Date:   Wed Dec 23 20:24:29 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>


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-12-23 23:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-23 23:30 [gcc r11-6327] Account for VxWorks headers in libstdc++ test on names Alexandre Oliva

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).