diff options
| author | unknown <brian@zim.(none)> | 2006-03-09 10:09:52 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-03-09 10:09:52 -0800 |
| commit | 85d705b651cf9057f2d687294044f173880675c3 (patch) | |
| tree | cd52a724927c26ff68a6bac83139664decc8a7fc /sql/sql_lex.h | |
| parent | 5e54b63fa372ff2b6ff33fb4363febe15174c96c (diff) | |
| download | mariadb-git-85d705b651cf9057f2d687294044f173880675c3.tar.gz | |
Porting fix that allows others to include compiled code with different parsers.
Makes you wonder what I am up to, doesn't?
configure.in:
Adjusts bison to not create symbols that clash.
sql/sql_analyse.cc:
Adding define to make sure sql_yacc.h gets included.
sql/sql_lex.cc:
Fixing it so that sql_yacc.h is included
sql/sql_lex.h:
Fixing include rules
sql/sql_parse.cc:
Adding flag to compile sql_yacc.yy
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 8db059ae2fa..8bacc60d48d 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -37,8 +37,12 @@ class sp_pcontext; #define LEX_YYSTYPE void * #else #include "lex_symbol.h" +#if MYSQL_LEX #include "sql_yacc.h" #define LEX_YYSTYPE YYSTYPE * +#else +#define LEX_YYSTYPE void * +#endif #endif /* |