projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bcaee8
)
Fix testsuite/g++.old-deja/g++.mike/p658.C build failure on VxWorks RTP
author
Jerome Lambourg
<lambourg@adacore.com>
Fri, 1 Jan 2021 00:38:00 +0000
(21:38 -0300)
committer
Alexandre Oliva
<oliva@gnu.org>
Fri, 1 Jan 2021 05:06:42 +0000
(
02:06
-0300)
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
patch
|
blob
|
history
diff --git
a/gcc/testsuite/g++.old-deja/g++.mike/p658.C
b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
index 8fc7cd51b2be34c13f759f3fc80247665a6fd157..a6268a36fd76bf344445138cdc67703b80e11733 100644
(file)
--- 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