Merge branch '2.1' into 2.2

This commit is contained in:
Johan Wikman 2018-03-01 17:57:40 +02:00
commit 544e0eb60b

View File

@ -35,7 +35,7 @@ USTR [%-_[:alnum:][:punct:]]+
CMP [=<>!]+
%%
"\n"+ return '\n';
{SPACE}"\n"+ return '\n';
{COMMENT} return FWTOK_COMMENT;
deny|allow MXS_WARNING("Use of '%s' is deprecated, use 'match' instead", yytext);return FWTOK_MATCH;
rule return FWTOK_RULE;