Merge branch 'master' into int-new
This commit is contained in:
commit
77810030d2
1 changed files with 5 additions and 0 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue