diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-08-16 18:27:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-16 19:07:51 +0200 |
| commit | 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 (patch) | |
| tree | 1bb3265705b4dfbf3f2edc785c0a0753ea84ad3a | |
| parent | 15269be91709c7a8d86abefb4840c5c565486714 (diff) | |
| download | qtwebkit-60ba8bd5b3575d0c7740571fbb4e681b21a49a82.tar.gz | |
ANGLE doesn't build with bison 3.0
https://bugs.webkit.org/show_bug.cgi?id=119798
Reviewed by Antti Koivisto.
Make glslang.y compatible with bison 3.0
by using %lex-param to set YYLEX_PARAM.
* src/compiler/glslang.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Task-number: QTBUG-32913
Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y index 3cad33500..b41e95ae5 100644 --- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y +++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y @@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). %expect 1 /* One shift reduce conflict because of if | else */ %pure-parser %parse-param {TParseContext* context} +%lex-param {YYLEX_PARAM} %union { struct { |