diff -r 79de32ba3296 -r 89e065397ea6 util/qlalr/cppgenerator.cpp --- a/util/qlalr/cppgenerator.cpp Fri May 14 16:40:13 2010 +0300 +++ b/util/qlalr/cppgenerator.cpp Thu May 27 13:40:48 2010 +0300 @@ -355,7 +355,7 @@ out << startIncludeGuard(grammar.merged_output) << endl; if (copyright) { - out << "#if defined(Q_OS_VXWORKS) && defined(ERROR)" << endl + out << "#if defined(ERROR)" << endl << "# undef ERROR" << endl << "#endif" << endl << endl; }