Merge 13159:13510 from trunk

[reactos.git] / reactos / tools / cabman / dfp.h

diff --git a/reactos/tools/cabman/dfp.h b/reactos/tools/cabman/dfp.h
index 8a127bc..8bd70d9 100755 (executable)
--- a/reactos/tools/cabman/dfp.h
+++ b/reactos/tools/cabman/dfp.h
@@ -32,7 +32,7 @@ typedef enum {
     TokenPeriod,
     TokenBackslash,
     TokenEnd,
-} TOKEN;
+} DFP_TOKEN;
 
 
 typedef enum {
@@ -86,7 +86,7 @@ private:
     unsigned long PerformCommand();
     unsigned long PerformFileCopy();
     void SkipSpaces();
-    bool IsNextToken(TOKEN Token, bool NoSpaces);
+    bool IsNextToken(DFP_TOKEN Token, bool NoSpaces);
     bool ReadLine();
     void NextToken();
     /* Parsing */
@@ -100,7 +100,7 @@ private:
     unsigned long CurrentLine;
     unsigned long CurrentChar;
     /* Token */
-    TOKEN CurrentToken;
+    DFP_TOKEN CurrentToken;
     unsigned long CurrentInteger;
     char CurrentString[256];