diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
| commit | 97d28c26ba981332f51ab81024bb8b0224afeb81 (patch) | |
| tree | 9c03fd067695043b3a061ad192b6f45e2cf6ecba /src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp | |
| parent | d48c3129992bf4b962201fa908f37f0e2a61f7c4 (diff) | |
| parent | 180d9189e8098d98848367f673fff723ddd1d068 (diff) | |
| download | Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.zip Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.gz Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp index 71451d6..5b1be71 100644 --- a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp @@ -236,6 +236,7 @@ #include "JSObject.h" #include "JSString.h" +#include "Lexer.h" #include "NodeConstructors.h" #include "NodeInfo.h" #include <stdlib.h> @@ -257,7 +258,6 @@ #define YYERROR_VERBOSE #endif -int jscyylex(void* lvalp, void* llocp, void* globalPtr); int jscyyerror(const char*); static inline bool allowAutomaticSemicolon(JSC::Lexer&, int); |