diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
| commit | 2b46eff0e7f7d11cf957b9b180177cc4b368c9aa (patch) | |
| tree | 03e166e8393e1928ec5ed3c79c96fa0accd11460 /src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp | |
| parent | e1f691d84dad17c5ee47c97c31ae743093ad8bc9 (diff) | |
| parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
| download | Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.zip Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.gz Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.bz2 | |
Merge commit 'origin/4.6' into core-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); |