diff options
| author | Dave Airlie <[email protected]> | 2012-09-14 10:05:53 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-09-15 08:20:56 +1000 |
| commit | cc943c8470b38a1f13d2493f293a153f75754caa (patch) | |
| tree | b62afead3c59eed0e6ea4ec0c7ebca38ed8b3e03 | |
| parent | a29a4566354af53e3bdc4a925eddc0d7af2bf384 (diff) | |
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 <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/mesa/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 57325afabf7..8e4530da306 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 0a50dab97fd..0947bb0462c 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 %% |