From 7ba5ce389c9b8daeecbcb145a9b77bbc98577d10 Mon Sep 17 00:00:00 2001 From: Jerome Lambourg Date: Thu, 31 Dec 2020 21:38:00 -0300 Subject: [PATCH] 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. --- gcc/testsuite/g++.old-deja/g++.mike/p658.C | 4 ++-- 1 file 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 8fc7cd51b2b..a6268a36fd7 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 -- 2.30.2