# HG changeset patch # User Robert Jenssen # Date 1467021030 -36000 # Node ID 66f3c4e81721643bb66947c39181e38031f5dbbb # Parent 02216516bbfea0ca0ed238dd8655da59b853311a Rename bison/flex internal symbol names to silence "one definition rule" warning * oct-tex-lexer.in.ll (yyguts_t): Rename to octave_tex_yyguts_t. * oct-tex-parser.in.yy (yyalloc): Rename to octave_tex_yyalloc. diff -r 02216516bbfe -r 66f3c4e81721 libinterp/corefcn/oct-tex-lexer.in.ll --- a/libinterp/corefcn/oct-tex-lexer.in.ll Tue Jun 28 12:01:48 2016 -0700 +++ b/libinterp/corefcn/oct-tex-lexer.in.ll Mon Jun 27 19:50:30 2016 +1000 @@ -77,6 +77,7 @@ #define YY_NO_UNISTD_H 1 #define isatty octave_isatty_wrapper +#define yyguts_t octave_tex_yyguts_t %} diff -r 02216516bbfe -r 66f3c4e81721 libinterp/corefcn/oct-tex-parser.in.yy --- a/libinterp/corefcn/oct-tex-parser.in.yy Tue Jun 28 12:01:48 2016 -0700 +++ b/libinterp/corefcn/oct-tex-parser.in.yy Mon Jun 27 19:50:30 2016 +1000 @@ -35,6 +35,7 @@ static void yyerror (text_parser_tex& parser, const char *s); #define scanner parser.get_scanner () +#define yyalloc octave_tex_yyalloc #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) // Disable this warning for code that is generated by Bison, including