Merge branch 'master' into int-new

This commit is contained in:
Ondrej Zajicek (work) 2017-05-30 14:44:37 +02:00
commit 77810030d2

View file

@ -58,6 +58,11 @@ struct keyword {
#include "conf/keywords.h" #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); static uint cf_hash(byte *c);