Mesa (master): mesa: use a prefix for the program lex
Dave Airlie
airlied at kemper.freedesktop.org
Fri Sep 14 22:25:32 UTC 2012
Module: Mesa
Branch: master
Commit: cc943c8470b38a1f13d2493f293a153f75754caa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc943c8470b38a1f13d2493f293a153f75754caa
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 14 10:05:53 2012 +1000
mesa: use a prefix for the program lex
This avoids us making a global yylex symbol which will interfere will
all sorts of apps.
with libdricore which can't do symbol visibility currently we pollute
the namespace with this.
This is a candidate for 9.0 & stable branches.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
src/mesa/Makefile.am | 2 +-
src/mesa/program/program_lexer.l | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 57325af..8e4530d 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -73,7 +73,7 @@ main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
$(MKDIR_P) program
- $(AM_V_GEN) $(YACC) -v -d --output=program/program_parse.tab.c $<
+ $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $<
program/lex.yy.c: program/program_lexer.l
$(MKDIR_P) program
diff --git a/src/mesa/program/program_lexer.l b/src/mesa/program/program_lexer.l
index 0a50dab..0947bb0 100644
--- a/src/mesa/program/program_lexer.l
+++ b/src/mesa/program/program_lexer.l
@@ -165,6 +165,7 @@ szf [HR]?
cc C?
sat (_SAT)?
+%option prefix="_mesa_program_"
%option bison-bridge bison-locations reentrant noyywrap
%%
More information about the mesa-commit
mailing list