diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-30 07:30:09 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-30 07:30:09 (GMT) |
| commit | 1e6fdf225797f03990b4511cdf3655905ece2cf9 (patch) | |
| tree | 57ae414f6aa4c6dc2089a478dd15c93df6982ce9 /src/xmlpatterns/parser/winCEWorkaround.sed | |
| parent | 26a55136f393eed1689f3671e65187ce1523bf09 (diff) | |
| parent | a8ea6dc6357049847eab361328a611b42f681c2a (diff) | |
| download | Qt-1e6fdf225797f03990b4511cdf3655905ece2cf9.zip Qt-1e6fdf225797f03990b4511cdf3655905ece2cf9.tar.gz Qt-1e6fdf225797f03990b4511cdf3655905ece2cf9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
src/script/qscriptbuffer_p.h
src/script/qscriptclassinfo_p.h
src/script/qscriptecmadate.cpp
src/script/qscriptgc_p.h
src/script/qscriptmemberfwd_p.h
src/script/qscriptsyntaxcheckresult_p.h
src/script/qscriptvalueimplfwd_p.h
tests/auto/qscriptengine/tst_qscriptengine.cpp
util/webkit/mkdist-webkit
Diffstat (limited to 'src/xmlpatterns/parser/winCEWorkaround.sed')
| -rw-r--r-- | src/xmlpatterns/parser/winCEWorkaround.sed | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/xmlpatterns/parser/winCEWorkaround.sed b/src/xmlpatterns/parser/winCEWorkaround.sed index d1c09e8..46f18ae 100644 --- a/src/xmlpatterns/parser/winCEWorkaround.sed +++ b/src/xmlpatterns/parser/winCEWorkaround.sed @@ -17,4 +17,16 @@ \#ifdef SELF\ \# undef SELF\ \#endif\ +\/\* These tokens are defined in VxWorks kernel mode\ + \*\ + \* Hence this un-break fix. Note that this file was auto generated. *\/\ +\#ifdef ERROR\ +\# undef ERROR\ +\#endif\ +\#ifdef IMPORT\ +\# undef IMPORT\ +\#endif\ +\#ifdef MAP\ +\# undef MAP\ +\#endif\ |