aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/glsl/Makefile2
-rw-r--r--src/glsl/glsl_parser.ypp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 85298d06a01..a0ab1d6d401 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 74971cfb9da..7c5dc017d89 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;