summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao@abecasis.name>2009-11-05 15:18:52 (GMT)
committerJoão Abecasis <joao@abecasis.name>2009-11-05 15:18:52 (GMT)
commitad3e723c334d72b746979b284910ac9b698b2d0b (patch)
tree28fa320fcbd38938345f30817d75f19716c4e534 /src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
parentc4d8d7fd35c8ac7fd2c14208e5e7ca0a35c101e1 (diff)
parent4cd683231190443e5243f66098c7322e3808a131 (diff)
downloadQt-ad3e723c334d72b746979b284910ac9b698b2d0b.zip
Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.gz
Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.bz2
Merge commit 'origin/4.6' into large-file-support
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp2
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);