public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
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 Date: Fri, 18 Dec 2020 14:46:58 +0000 (GMT) [thread overview] Message-ID: <20201218144658.833123850411@sourceware.org> (raw) 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>
reply other threads:[~2020-12-18 14:46 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201218144658.833123850411@sourceware.org \ --to=aoliva@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).