diff -r 93b982ccede2 -r 5daf16870df6 util/qlalr/cppgenerator.cpp
--- a/util/qlalr/cppgenerator.cpp	Mon Jun 21 22:38:13 2010 +0100
+++ b/util/qlalr/cppgenerator.cpp	Thu Jul 22 16:41:55 2010 +0100
@@ -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;
       }