diff --git a/deps/pthread/op.lnk b/deps/pthread/op.lnk deleted file mode 100644 index 31ac49a9c053b21ad73a7f0a1005e1cb9c06f069..0000000000000000000000000000000000000000 Binary files a/deps/pthread/op.lnk and /dev/null differ diff --git a/src/system/src/vnodeImport.c b/src/system/src/vnodeImport.c index a839f4a6b8a830956a1f26159ffcb13601c8e1d8..f9874edd36233ff745bb0423eb795254e8950d76 100644 --- a/src/system/src/vnodeImport.c +++ b/src/system/src/vnodeImport.c @@ -131,7 +131,7 @@ int vnodeCloseFileForImport(SMeterObj *pObj, SHeadInfo *pHinfo) { lseek(pVnode->nfd, pHinfo->compInfoOffset, SEEK_SET); write(pVnode->nfd, &pHinfo->compInfo, sizeof(SCompInfo)); - chksum = taosCalcChecksum(0, buffer, size); + chksum = taosCalcChecksum(0, (uint8_t *)buffer, size); lseek(pVnode->nfd, pHinfo->compInfoOffset + sizeof(SCompInfo) + size, SEEK_SET); write(pVnode->nfd, &chksum, sizeof(TSCKSUM)); free(buffer); @@ -395,7 +395,7 @@ int vnodeImportToFile(SImportInfo *pImport) { if (*((TSKEY *)payload) > pVnode->commitLastKey) break; for (col = 0; col < pObj->numOfColumns; ++col) { - memcpy(offset[col], payload, pObj->schema[col].bytes); + memcpy((void *)offset[col], payload, pObj->schema[col].bytes); payload += pObj->schema[col].bytes; offset[col] += pObj->schema[col].bytes; }