From b985fcacacde776125008790ed53c8f6abac4df6 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@slot.vk.crocodile.org>
Date: Sat, 4 Jun 2011 20:32:37 -0700
Subject: [PATCH] fixing build on windows mingw: avoid token name "CONST"

---
 src/parsers/PFCfgParser.cpp           | 6 +++---
 src/parsers/PFCfgParserTokenTypes.hpp | 2 +-
 src/parsers/PFCfgParserTokenTypes.txt | 2 +-
 src/parsers/pf.g                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/parsers/PFCfgParser.cpp b/src/parsers/PFCfgParser.cpp
index 0771cf528..195dceddc 100644
--- a/src/parsers/PFCfgParser.cpp
+++ b/src/parsers/PFCfgParser.cpp
@@ -414,7 +414,7 @@ void PFCfgParser::table_rule() {
 		}
 		case NEWLINE:
 		case OPENING_BRACE:
-		case CONST:
+		case CONST_WORD:
 		case COUNTERS:
 		case FILE:
 		{
@@ -428,9 +428,9 @@ void PFCfgParser::table_rule() {
 		}
 		{
 		switch ( LA(1)) {
-		case CONST:
+		case CONST_WORD:
 		{
-			match(CONST);
+			match(CONST_WORD);
 			break;
 		}
 		case NEWLINE:
diff --git a/src/parsers/PFCfgParserTokenTypes.hpp b/src/parsers/PFCfgParserTokenTypes.hpp
index 9130c27bb..dac38128d 100644
--- a/src/parsers/PFCfgParserTokenTypes.hpp
+++ b/src/parsers/PFCfgParserTokenTypes.hpp
@@ -78,7 +78,7 @@ struct CUSTOM_API PFCfgParserTokenTypes {
 		LESS_THAN = 67,
 		GREATER_THAN = 68,
 		PERSIST = 69,
-		CONST = 70,
+		CONST_WORD = 70,
 		COUNTERS = 71,
 		FILE = 72,
 		STRING = 73,
diff --git a/src/parsers/PFCfgParserTokenTypes.txt b/src/parsers/PFCfgParserTokenTypes.txt
index 20441819c..0414a6b24 100644
--- a/src/parsers/PFCfgParserTokenTypes.txt
+++ b/src/parsers/PFCfgParserTokenTypes.txt
@@ -66,7 +66,7 @@ TABLE="table"=66
 LESS_THAN=67
 GREATER_THAN=68
 PERSIST="persist"=69
-CONST="const"=70
+CONST_WORD="const"=70
 COUNTERS="counters"=71
 FILE="file"=72
 STRING=73
diff --git a/src/parsers/pf.g b/src/parsers/pf.g
index 88e3f251c..7b956dc19 100644
--- a/src/parsers/pf.g
+++ b/src/parsers/pf.g
@@ -534,7 +534,7 @@ table_rule :
         name:WORD
         GREATER_THAN 
         ( PERSIST ) ?
-        ( CONST ) ?
+        ( CONST_WORD ) ?
         ( COUNTERS )?
         (
             FILE file:STRING
@@ -1864,7 +1864,7 @@ tokens
     RDR = "rdr";
     BINAT = "binat";
     TABLE = "table";
-    CONST = "const";
+    CONST_WORD = "const";
     PERSIST = "persist";
     COUNTERS = "counters";
     FILE = "file";