Merge branch 'master' into int-new

2017-05-30 14:44:37 +02:00 · 2017-05-30 14:44:37 +02:00 · 77810030d2
parent a1dc526760 4fec43067e
commit 77810030d2
1 changed files with 5 additions and 0 deletions
--- 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);