aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Lambourg <lambourg@adacore.com>2020-12-31 21:38:00 -0300
committerAlexandre Oliva <oliva@gnu.org>2021-01-01 02:06:42 -0300
commit7ba5ce389c9b8daeecbcb145a9b77bbc98577d10 (patch)
tree7c4fa7cc1a405644a140ab7037b77a1000548edf
parent0bcaee87e8da563854cd3add4a70c26ac2d1aff6 (diff)
downloadgcc-7ba5ce389c9b8daeecbcb145a9b77bbc98577d10.zip
gcc-7ba5ce389c9b8daeecbcb145a9b77bbc98577d10.tar.gz
gcc-7ba5ce389c9b8daeecbcb145a9b77bbc98577d10.tar.bz2
Fix testsuite/g++.old-deja/g++.mike/p658.C build failure on VxWorks RTP
The conflicting definition of OK is present in VxWorks RTP headers too. for gcc/testsuite/ChangeLog * g++.old-deja/g++.mike/p658.C: Also undefine OK on VxWorks RTP.
-rw-r--r--gcc/testsuite/g++.old-deja/g++.mike/p658.C4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p658.C b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
index 8fc7cd5..a6268a3 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p658.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
@@ -12,9 +12,9 @@
#define TRUE true
#endif
-// The VxWorks kernel-mode headers define a macro named "OK", which is not
+// The VxWorks headers define a macro named "OK", which is not
// ISO-compliant, but is part of the VxWorks API.
-#if defined __vxworks && !defined __RTP__
+#if defined __vxworks
#undef OK
#endif