glcpp: fix abuse of yylex
authorDave Airlie <airlied@gmail.com>
Fri, 14 Sep 2012 09:59:54 +0000 (19:59 +1000)
committerDave Airlie <airlied@gmail.com>
Fri, 14 Sep 2012 22:27:51 +0000 (08:27 +1000)
commit8f7990c5f2ca25e42c7fefff6312bee2ff77e134
tree6d7d86d28b54ec79ed4fc387951bc58fa0520d73
parenta834381506d5be80251953666198fc3b9bc4b731
glcpp: fix abuse of yylex

So glcpp tried to workaround yylex its own way, but failed,
do it properly.

This fixes another crash found after fixing the first crash.

this is a candidate for 9.0 and stable branches

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a)
src/glsl/glcpp/Makefile.am
src/glsl/glcpp/glcpp-parse.y