diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-30 14:44:37 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-30 14:44:37 +0200 |
| commit | 77810030d2556e3af659d354a2b3d661f58dd735 (patch) | |
| tree | 7784d53b19cfa92a6a8e524c9823261da4b2513f /conf/cf-lex.l | |
| parent | a1dc5267602062562f9adca7acfbbc2fee3b315e (diff) | |
| parent | 4fec43067e27c7a6c20a6ef9909bef0238984a64 (diff) | |
Merge branch 'master' into int-new
Diffstat (limited to 'conf/cf-lex.l')
| -rw-r--r-- | conf/cf-lex.l | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 54d83496..c3154b36 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -58,6 +58,11 @@ struct keyword { #include "conf/keywords.h" +/* Could be defined by Bison in cf-parse.tab.h, inteferes with SYM hash */ +#ifdef SYM +#undef SYM +#endif + static uint cf_hash(byte *c); |