TD-1037

deps/CMakeLists.txt

@@ -7,6 +7,7 @@ ADD_SUBDIRECTORY(regex)
 ADD_SUBDIRECTORY(iconv)
 ADD_SUBDIRECTORY(lz4)
 ADD_SUBDIRECTORY(cJson)
+#ADD_SUBDIRECTORY(MsvcLibX)
 
 IF (NOT TD_WINDOWS)
   ADD_SUBDIRECTORY(MQTT-C)

deps/iconv/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
   LIST(APPEND SRC iconv.c)
   LIST(APPEND SRC localcharset.c)
   INCLUDE_DIRECTORIES(.)

deps/pthread/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(.)
   LIST(APPEND SRC pthread.c)
   ADD_LIBRARY(pthread ${SRC})

deps/regex/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(inc .)
   LIST(APPEND SRC regex.c)
   ADD_LIBRARY(regex ${SRC})

deps/zlib-1.2.11/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64)
+IF (TD_LINUX_64 OR TD_WINDOWS_64)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
   ADD_LIBRARY(z ${SRC})

deps/zlib-1.2.11/src/zconf.h

@@ -472,7 +472,12 @@ typedef uLong FAR uLongf;
 #endif
 #ifndef Z_SOLO
 #  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#if (_WIN64)
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#endif
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
 #    endif

src/client/CMakeLists.txt

@@ -37,7 +37,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
 
   ADD_SUBDIRECTORY(tests)
 
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)

src/kit/shell/CMakeLists.txt

@@ -22,7 +22,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
 #  ENDIF ()
   
   SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
   LIST(APPEND SRC ./src/shellEngine.c)

src/util/inc/tchecksum.h

@@ -53,7 +53,12 @@ static FORCE_INLINE int taosCheckChecksum(const uint8_t *stream, uint32_t ssize,
 
 static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t ssize) {
   if (ssize < sizeof(TSCKSUM)) return 0;
+
+#if (_WIN64)
+  return 1;
+#else
   return *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) == (*crc32c)(0, stream, (size_t)(ssize - sizeof(TSCKSUM)));
+#endif
 }
 
 #ifdef __cplusplus