Merge branch 'feature/ad' of https://github.com/taosdata/TDengine into feature/ad

deps/zlib-1.2.11/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(z ${SRC})
-ENDIF ()
+IF (TD_WINDOWS)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
+ENDIF()
+
\ No newline at end of file
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+ADD_LIBRARY(z ${SRC})

src/os/src/detail/osDir.c

@@ -130,7 +130,7 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
   }
 
   while (!feof(srcFp)) {
-    len = (uLong)fread(data, 1, COMPRESS_STEP_SIZE, srcFp);
+    len = (int32_t)fread(data, 1, COMPRESS_STEP_SIZE, srcFp);
     gzwrite(dstFp, data, len);
   }