From e8877f5f2165a57c51e312e79fda6c043788173e Mon Sep 17 00:00:00 2001
From: liu0x54 <tliu@taosdata.com>
Date: Sat, 20 Jun 2020 08:42:49 +0000
Subject: [PATCH] [TD-711] fix the token define conflicts

---
 src/inc/ttokendef.h    | 10 ++++++++++
 src/util/inc/tstoken.h |  9 +--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h
index d388bc9dbe..7648aadc60 100644
--- a/src/inc/ttokendef.h
+++ b/src/inc/ttokendef.h
@@ -221,6 +221,16 @@
 #define TK_INTO                           203
 #define TK_VALUES                         204
 
+
+#define TK_SPACE      300
+#define TK_COMMENT    301
+#define TK_ILLEGAL    302
+#define TK_HEX        303   // hex number  0x123
+#define TK_OCT        304   // oct number
+#define TK_BIN        305   // bin format data 0b111
+#define TK_FILE       306
+#define TK_QUESTION   307   // denoting the placeholder of "?",when invoking statement bind query
+
 #endif
 
 
diff --git a/src/util/inc/tstoken.h b/src/util/inc/tstoken.h
index 74687e9c18..7b0e498d76 100644
--- a/src/util/inc/tstoken.h
+++ b/src/util/inc/tstoken.h
@@ -24,14 +24,7 @@ extern "C" {
 #include "tutil.h"
 #include "ttokendef.h"
 
-#define TK_SPACE      200
-#define TK_COMMENT    201
-#define TK_ILLEGAL    202
-#define TK_HEX        203   // hex number  0x123
-#define TK_OCT        204   // oct number
-#define TK_BIN        205   // bin format data 0b111
-#define TK_FILE       206
-#define TK_QUESTION   207   // denoting the placeholder of "?",when invoking statement bind query
+
 
 #define TSQL_TBNAME   "TBNAME"
 #define TSQL_TBNAME_L "tbname"
-- 
GitLab