diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 21:18:11 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 21:18:11 (GMT) |
| commit | 4d1a9b18b905f21b70608b13f4789dadec6bc181 (patch) | |
| tree | bfa0d9364432b0c4fc55648acc0f99a3a12e42f9 /src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp | |
| parent | a6a8e2b1918b2037c9d79e59aabf04ef09bee73e (diff) | |
| parent | 6e84a8f0d93f178611a40917fec92648e956fe38 (diff) | |
| download | Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.zip Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.tar.gz Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt 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); |