diff --git a/cmake/define.inc b/cmake/define.inc
index 98b54bfb5011283f16259cd032d33da02e10f75e..5a5a667cd8cd4462f9d70513d60e6d6238e20682 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -62,7 +62,7 @@ ENDIF ()
 
 IF (TD_ARM_64)
   ADD_DEFINITIONS(-D_M_X64)
-  ADD_DEFINITIONS(-D_TD_ARM_64_)
+  ADD_DEFINITIONS(-D_TD_ARM_64)
   ADD_DEFINITIONS(-D_TD_ARM_)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "arm64 is defined")
@@ -70,7 +70,7 @@ IF (TD_ARM_64)
 ENDIF ()
 
 IF (TD_ARM_32)
-  ADD_DEFINITIONS(-D_TD_ARM_32_)
+  ADD_DEFINITIONS(-D_TD_ARM_32)
   ADD_DEFINITIONS(-D_TD_ARM_)
   MESSAGE(STATUS "arm32 is defined")
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types ")
@@ -102,7 +102,7 @@ IF (TD_LINUX)
   ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
 
   IF (TD_NINGSI_60)
-    ADD_DEFINITIONS(-D_TD_NINGSI_60_)
+    ADD_DEFINITIONS(-D_TD_NINGSI_60)
     MESSAGE(STATUS "set ningsi macro to true")
   ENDIF ()
   
diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c
index ff417b6cdef4c60dc8d563800a2b2d4c92c8d0c3..45ec20ce4533c6bf9a81b045f6f07f02bbe53121 100644
--- a/src/common/src/ttypes.c
+++ b/src/common/src/ttypes.c
@@ -235,7 +235,7 @@ static void getStatics_f(const TSKEY *primaryKey, const void *pData, int32_t num
   double csum = 0;
   csum = GET_DOUBLE_VAL(sum);
   csum += dsum;
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
   SET_DOUBLE_VAL_ALIGN(sum, &csum);
   SET_DOUBLE_VAL_ALIGN(max, &fmax);
   SET_DOUBLE_VAL_ALIGN(min, &fmin);
@@ -282,7 +282,7 @@ static void getStatics_d(const TSKEY *primaryKey, const void *pData, int32_t num
   csum += dsum;
 
 
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
   SET_DOUBLE_VAL_ALIGN(sum, &csum);
   SET_DOUBLE_VAL_ALIGN(max, &dmax);
   SET_DOUBLE_VAL_ALIGN(min, &dmin);
@@ -494,7 +494,7 @@ void assignVal(char *val, const char *src, int32_t len, int32_t type) {
       break;
     }
     case TSDB_DATA_TYPE_FLOAT: {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
       float fv = GET_FLOAT_VAL(src);
       SET_FLOAT_VAL_ALIGN(val, &fv);
 #else
@@ -503,7 +503,7 @@ void assignVal(char *val, const char *src, int32_t len, int32_t type) {
       break;
     };
     case TSDB_DATA_TYPE_DOUBLE: {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
       double dv = GET_DOUBLE_VAL(src);
       SET_DOUBLE_VAL_ALIGN(val, &dv);
 #else
diff --git a/src/common/src/tvariant.c b/src/common/src/tvariant.c
index 069d8eb2517cbbd70477652140294fb3b3863906..ba118d2ccb05152b3d59dcc53fcb81ac0b4b62ce 100644
--- a/src/common/src/tvariant.c
+++ b/src/common/src/tvariant.c
@@ -709,7 +709,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
             return -1;
           }
 
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
           //memcpy(&payload, &value, sizeof(float));
           float fv = (float)value;
           SET_FLOAT_VAL_ALIGN(payload, &fv);
@@ -718,7 +718,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
 #endif
         }
       } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
         //memcpy(&payload, &pVariant->i64Key, sizeof(float));
         float fv = (float)pVariant->i64Key;
         SET_FLOAT_VAL_ALIGN(payload, &fv);
@@ -726,7 +726,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
         *((float *)payload) = (float)pVariant->i64Key;
 #endif
       } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
         //memcpy(&payload, &pVariant->dKey, sizeof(float));
         float fv = (float)pVariant->dKey;
         SET_FLOAT_VAL_ALIGN(payload, &fv);
@@ -738,7 +738,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
         return 0;
       }
 
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
       float fv = GET_FLOAT_VAL(payload);
       if (isinf(fv) || isnan(fv) || fv > FLT_MAX || fv < -FLT_MAX) {
         return -1;
@@ -765,21 +765,21 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
             return -1;
           }
 
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
           SET_DOUBLE_VAL_ALIGN(payload, &value);
 #else
           *((double *)payload) = value;
 #endif
         }
       } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
         double dv = (double)(pVariant->i64Key);
         SET_DOUBLE_VAL_ALIGN(payload, &dv);
 #else
         *((double *)payload) = (double)pVariant->i64Key;
 #endif
       } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
         double dv = (double)(pVariant->dKey);
         SET_DOUBLE_VAL_ALIGN(payload, &dv);
 #else
@@ -790,7 +790,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
         return 0;
       }
 
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
       double dv = GET_DOUBLE_VAL(payload);
       if (isinf(dv) || isnan(dv) || dv > DBL_MAX || dv < -DBL_MAX) {
         return -1;
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 228aba2a5e57cc362ffb3af54a81093328e047b5..f636cde8e5bc66314152a74a91a005551f4b9ec1 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -131,7 +131,7 @@ do { \
 #define GET_INT16_VAL(x)  (*(int16_t *)(x))
 #define GET_INT32_VAL(x)  (*(int32_t *)(x))
 #define GET_INT64_VAL(x)  (*(int64_t *)(x))
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
   #define GET_FLOAT_VAL(x)  taos_align_get_float(x)
   #define GET_DOUBLE_VAL(x) taos_align_get_double(x)
 
diff --git a/src/os/inc/os.h b/src/os/inc/os.h
index 8ce49d6750cf57bd58ac5d434fd5a26aae0290b8..86e16db8b1446308060945d3a7db2531287c62ec 100644
--- a/src/os/inc/os.h
+++ b/src/os/inc/os.h
@@ -24,11 +24,11 @@ extern "C" {
 #include "osDarwin.h"
 #endif
 
-#ifdef _TD_ARM_64_
+#ifdef _TD_ARM_64
 #include "osArm64.h"
 #endif
 
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
 #include "osArm32.h"
 #endif
 
@@ -44,7 +44,7 @@ extern "C" {
 #include "osAlpine.h"
 #endif
 
-#ifdef _TD_NINGSI_60_
+#ifdef _TD_NINGSI_60
 #include "osNingsi.h"
 #endif
 
diff --git a/src/os/src/detail/CMakeLists.txt b/src/os/src/detail/CMakeLists.txt
index cbb8d46da8a9f19d3b08fbce550850e7c70dde5c..3c6810fcd524d3d33ef7af67e84e29f79d6dee79 100644
--- a/src/os/src/detail/CMakeLists.txt
+++ b/src/os/src/detail/CMakeLists.txt
@@ -10,6 +10,6 @@ SET_SOURCE_FILES_PROPERTIES(osCoredump.c PROPERTIES COMPILE_FLAGS -w)
 ADD_LIBRARY(osdetail ${SRC})
 TARGET_LINK_LIBRARIES(osdetail os)
 
-IF (TD_ARM_64)
+IF (TD_ARM_32)
   TARGET_LINK_LIBRARIES(osdetail atomic)
-ENDIF ()
\ No newline at end of file
+ENDIF ()
diff --git a/src/os/src/linux/ningsi.c b/src/os/src/linux/ningsi.c
index 793ccac84adc05988c9fbb0b6b1d13170752c76a..2514c38ece835630c8bfbf7714868701c193d116 100644
--- a/src/os/src/linux/ningsi.c
+++ b/src/os/src/linux/ningsi.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 
-#ifdef _TD_NINGSI_60_
+#ifdef _TD_NINGSI_60
 void* atomic_exchange_ptr_impl(void** ptr, void* val ) {
   void *old;
   do {
diff --git a/src/plugins/http/src/httpGcJson.c b/src/plugins/http/src/httpGcJson.c
index a291641dc376c6d581a137403a1ac623ce9dd5ec..fde8ae2176007b1f042393d8d1fc112198c3ff64 100644
--- a/src/plugins/http/src/httpGcJson.c
+++ b/src/plugins/http/src/httpGcJson.c
@@ -145,7 +145,7 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
             len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%d,", fields[i].name, *((int32_t *)row[i]));
             break;
           case TSDB_DATA_TYPE_BIGINT:
-            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%ld", fields[i].name, *((int64_t *)row[i]));
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%" PRId64, fields[i].name, *((int64_t *)row[i]));
             break;
           case TSDB_DATA_TYPE_FLOAT:
             len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%.5f", fields[i].name, *((float *)row[i]));
diff --git a/src/plugins/http/src/httpJson.c b/src/plugins/http/src/httpJson.c
index 7600fb3e43af236c59a5afea0a4ad981019b2b32..1aa6cfac4bf9414e6aa8004ca1bb120b2d40feba 100644
--- a/src/plugins/http/src/httpJson.c
+++ b/src/plugins/http/src/httpJson.c
@@ -113,7 +113,7 @@ int32_t httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
       httpTrace("context:%p, fd:%d, no data need dump", buf->pContext, buf->pContext->fd);
       return 0;  // there is no data to dump.
     } else {
-      int32_t len = sprintf(sLen, "%lx\r\n", srcLen);
+      int32_t len = sprintf(sLen, "%" PRIx64 "\r\n", srcLen);
       httpTrace("context:%p, fd:%d, write body, chunkSize:%" PRIu64 ", response:\n%s", buf->pContext, buf->pContext->fd,
                 srcLen, buf->buf);
       httpWriteBufNoTrace(buf->pContext, sLen, len);
@@ -267,9 +267,9 @@ void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) {
   ptm = localtime(&tt);
   int32_t length = (int32_t) strftime(ts, 35, "%Y-%m-%d %H:%M:%S", ptm);
   if (us) {
-    length += snprintf(ts + length, 8, ".%06ld", t % precision);
+    length += snprintf(ts + length, 8, ".%06" PRId64, t % precision);
   } else {
-    length += snprintf(ts + length, 5, ".%03ld", t % precision);
+    length += snprintf(ts + length, 5, ".%03" PRId64, t % precision);
   }
 
   httpJsonString(buf, ts, length);
@@ -287,9 +287,9 @@ void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us) {
   ptm = localtime(&tt);
   int32_t length = (int32_t)strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", ptm);
   if (us) {
-    length += snprintf(ts + length, 8, ".%06ld", t % precision);
+    length += snprintf(ts + length, 8, ".%06" PRId64, t % precision);
   } else {
-    length += snprintf(ts + length, 5, ".%03ld", t % precision);
+    length += snprintf(ts + length, 5, ".%03" PRId64, t % precision);
   }
   length += (int32_t)strftime(ts + length, 40 - length, "%z", ptm);
 
diff --git a/src/sync/src/syncRetrieve.c b/src/sync/src/syncRetrieve.c
index 6d0b847afee7679783c05645e1ea762b89338630..60625d75eccdbe6bbb29f97b31ecd8e9855480a7 100644
--- a/src/sync/src/syncRetrieve.c
+++ b/src/sync/src/syncRetrieve.c
@@ -325,7 +325,7 @@ static int syncProcessLastWal(SSyncPeer *pPeer, char *wname, uint32_t index) {
       // if all data up to fversion is read out, it is over
       if (pPeer->sversion >= fversion && fversion > 0) {
         code = 0;
-        sDebug("%s, data up to fversion:%ld has been read out, bytes:%d", pPeer->id, fversion, bytes);
+        sDebug("%s, data up to fversion:%" PRId64 " has been read out, bytes:%d", pPeer->id, fversion, bytes);
         break;
       }
 
diff --git a/src/sync/test/syncServer.c b/src/sync/test/syncServer.c
index 8e769a461e1b1d6c995cc64b3a4cd6dfc0dd4172..aa07779845bfaea3195a05b91a0ee75b9946f2a7 100644
--- a/src/sync/test/syncServer.c
+++ b/src/sync/test/syncServer.c
@@ -386,7 +386,7 @@ int main(int argc, char *argv[]) {
       printf("  [-m msgSize]: message body size, default is:%d\n", msgSize);
       printf("  [-o compSize]: compression message size, default is:%d\n", tsCompressMsgSize);
       printf("  [-w write]: write received data to file(0, 1, 2), default is:%d\n", commit);
-      printf("  [-v version]: initial node version, default is:%ld\n", syncInfo.version);
+      printf("  [-v version]: initial node version, default is:%" PRId64 "\n", syncInfo.version);
       printf("  [-r replica]: replicacation number, default is:%d\n", pCfg->replica);
       printf("  [-q quorum]: quorum, default is:%d\n", pCfg->quorum);
       printf("  [-d debugFlag]: debug flag, default:%d\n", rpcDebugFlag);
diff --git a/src/wal/test/waltest.c b/src/wal/test/waltest.c
index 073dbf72af02437dc494fdf18ceeebaa24777dca..bbee1347b8f92aa6cfad448fdfb369de8f5a6301 100644
--- a/src/wal/test/waltest.c
+++ b/src/wal/test/waltest.c
@@ -71,7 +71,7 @@ int main(int argc, char *argv[]) {
       printf("  [-t total]: total wal files, default is:%d\n", total);
       printf("  [-r rows]: rows of records per wal file, default is:%d\n", rows);
       printf("  [-k keep]: keep the wal after closing, default is:%d\n", keep);
-      printf("  [-v version]: initial version, default is:%ld\n", ver);
+      printf("  [-v version]: initial version, default is:%" PRId64 "\n", ver);
       printf("  [-d debugFlag]: debug flag, default:%d\n", dDebugFlag);
       printf("  [-h help]: print out this help\n\n");
       exit(0);
@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
     exit(-1);
   }
 
-  printf("version starts from:%ld\n", ver);
+  printf("version starts from:%" PRId64 "\n", ver);
   
   int contLen = sizeof(SWalHead) + size;
   SWalHead *pHead = (SWalHead *) malloc(contLen);
diff --git a/tests/comparisonTest/tdengine/tdengineTest.c b/tests/comparisonTest/tdengine/tdengineTest.c
index 3d78a3d0a54ac571aceb13c1bb9a6f133589bd86..237403f52565c1b68b21e895d5555a2a673bb5f7 100644
--- a/tests/comparisonTest/tdengine/tdengineTest.c
+++ b/tests/comparisonTest/tdengine/tdengineTest.c
@@ -278,7 +278,7 @@ void writeData() {
 
   free(threads);
 
-  printf("---- Spent %f seconds to insert %ld records, speed: %f Rows/Second\n", seconds, statis.totalRows, rs);
+  printf("---- Spent %f seconds to insert %" PRId64 " records, speed: %f Rows/Second\n", seconds, statis.totalRows, rs);
 }
 
 void readDataImp(void *param)
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index f0e970c3325346eb5ebd341dae8fcbc7d968a8c2..d64c0de1ce45597e26396979bb693cc0f96873d5 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 #include <taos.h>  // TAOS header file
 
 int main(int argc, char *argv[]) {
@@ -67,7 +68,7 @@ int main(int argc, char *argv[]) {
   // insert 10 records
   int i = 0;
   for (i = 0; i < 10; ++i) {
-    sprintf(qstr, "insert into m1 values (%ld, %d, %d, %d, %d, %f, %lf, '%s')", 1546300800000 + i * 1000, i, i, i, i*10000000, i*1.0, i*2.0, "hello");
+    sprintf(qstr, "insert into m1 values (%" PRId64 ", %d, %d, %d, %d, %f, %lf, '%s')", 1546300800000 + i * 1000, i, i, i, i*10000000, i*1.0, i*2.0, "hello");
     printf("qstr: %s\n", qstr);
     if (taos_query(taos, qstr)) {
       printf("insert row: %i, reason:%s\n", i, taos_errstr(taos));
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index 463dc33c7cc4f73e888fe5583b8311102fdd41b1..4bb0cbe86f2186a7a94ee256822935296721d00a 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -751,7 +751,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
               sprintf(value, "%" PRId64, *((int64_t *)row[i]));
               break;
             case TSDB_DATA_TYPE_FLOAT:{
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
               float fv = 0;
               *(int32_t*)(&fv) = *(int32_t*)row[i];
               sprintf(value, "%.5f", fv);
@@ -761,7 +761,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
             }
               break;
             case TSDB_DATA_TYPE_DOUBLE: {
-#ifdef _TD_ARM_32_
+#ifdef _TD_ARM_32
               double dv = 0;
               *(int64_t*)(&dv) = *(int64_t*)row[i];
               sprintf(value, "%.9lf", dv);