diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index afd7034319..af44ec3bae 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -61,7 +61,7 @@
   #undef TD_CLOSE_MSG_TYPE
   #define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM,
   #define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP)
-  #define TD_CLOSE_MSG_TYPE(type)
+  #define TD_CLOSE_MSG_TYPE(TYPE)
 
   int32_t tMsgDict[] = {
 
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 4e828812f1..d69542c98b 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -18,12 +18,14 @@
 
 #undef TD_MSG_NUMBER_
 #undef TD_MSG_DICT_
+#undef TD_MSG_RANGE_CODE_
 #define TD_MSG_INFO_
 #undef TD_MSG_SEG_CODE_
 #include "tmsgdef.h"
 
 #undef TD_MSG_NUMBER_
 #undef TD_MSG_INFO_
+#undef TD_MSG_RANGE_CODE_
 #define TD_MSG_DICT_
 #undef TD_MSG_SEG_CODE_
 #include "tmsgdef.h"
@@ -37,7 +39,6 @@
 
 #include "tlog.h"
 
-
 #define DECODESQL()                                                                 \
   do {                                                                              \
     if (!tDecodeIsEnd(&decoder)) {                                                  \