Mesa (glsl2): glsl2: Use bison command line option to set prefix
Ian Romanick
idr at kemper.freedesktop.org
Thu Aug 12 00:26:52 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 2fb94b37d2ace1170018cc36f50cf6e71fc708c4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fb94b37d2ace1170018cc36f50cf6e71fc708c4
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Aug 11 17:14:02 2010 -0700
glsl2: Use bison command line option to set prefix
Bison version 2.3 doesn't seem to support %name-prefix in the source.
This should fix bugzilla #29207.
---
src/glsl/Makefile | 2 +-
src/glsl/glsl_parser.ypp | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 85298d0..a0ab1d6 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -154,7 +154,7 @@ glsl_lexer.cpp: glsl_lexer.lpp
flex --never-interactive --outfile="$@" $<
glsl_parser.cpp: glsl_parser.ypp
- bison -v -o "$@" --defines=glsl_parser.h $<
+ bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
flex --never-interactive --outfile="$@" $<
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index 74971cf..7c5dc01 100644
--- a/src/glsl/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
@@ -48,7 +48,6 @@
%lex-param {void *scanner}
%parse-param {struct _mesa_glsl_parse_state *state}
-%name-prefix "_mesa_glsl_"
%union {
int n;
More information about the mesa-commit
mailing list