fixing build on windows mingw: avoid token name "IN"

This commit is contained in:
Vadim Kurland
2011-06-04 20:36:07 -07:00
parent b985fcacac
commit 36a6472f95
4 changed files with 17 additions and 17 deletions
+10 -10
View File
@@ -1301,8 +1301,8 @@ void PFCfgParser::block_rule() {
case EXLAMATION:
case NO:
case OPENING_PAREN:
case IN:
case OUT:
case IN_WORD:
case OUT_WORD:
case LOG:
case ALL:
case TO:
@@ -2103,8 +2103,8 @@ void PFCfgParser::rule_extended() {
try { // for error handling
{
switch ( LA(1)) {
case IN:
case OUT:
case IN_WORD:
case OUT_WORD:
{
direction();
break;
@@ -3429,8 +3429,8 @@ void PFCfgParser::block_return() {
case EXLAMATION:
case NO:
case OPENING_PAREN:
case IN:
case OUT:
case IN_WORD:
case OUT_WORD:
case LOG:
case ALL:
case TO:
@@ -3806,14 +3806,14 @@ void PFCfgParser::direction() {
try { // for error handling
{
switch ( LA(1)) {
case IN:
case IN_WORD:
{
match(IN);
match(IN_WORD);
break;
}
case OUT:
case OUT_WORD:
{
match(OUT);
match(OUT_WORD);
break;
}
default:
+2 -2
View File
@@ -115,8 +115,8 @@ struct CUSTOM_API PFCfgParserTokenTypes {
TTL = 104,
RETURN_ICMP = 105,
RETURN_ICMP6 = 106,
IN = 107,
OUT = 108,
IN_WORD = 107,
OUT_WORD = 108,
LOG = 109,
ALL = 110,
USER = 111,
+2 -2
View File
@@ -103,8 +103,8 @@ RETURN_RST="return-rst"=103
TTL=104
RETURN_ICMP="return-icmp"=105
RETURN_ICMP6=106
IN="in"=107
OUT="out"=108
IN_WORD="in"=107
OUT_WORD="out"=108
LOG="log"=109
ALL="all"=110
USER="user"=111
+3 -3
View File
@@ -985,7 +985,7 @@ rule_extended :
( filteropts )?
;
direction : ( IN | OUT )
direction : ( IN_WORD | OUT_WORD )
{
importer->direction = LT(0)->getText();
}
@@ -1783,8 +1783,8 @@ tokens
QUICK = "quick";
IN = "in";
OUT = "out";
IN_WORD = "in";
OUT_WORD = "out";
ON = "on";
PROTO = "proto";