Fix MSVC build.

diff --git a/thirdparty/zlib/CMakeLists.txt b/thirdparty/zlib/CMakeLists.txt
index 1721574e450803f09928fcb79964f1088e71a942..55423c8b59b5fe439f3d5e34aacf7fe13fada1d8 100644 (file)
--- a/thirdparty/zlib/CMakeLists.txt
+++ b/thirdparty/zlib/CMakeLists.txt
@@ -1,6 +1,11 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
-add_definitions(-DNO_VIZ)
+add_definitions (-DNO_VIZ)
+
+# adjust warnings
+if (MSVC)
+    add_definitions (-wd4131) # uses old-style declarator
+endif ()
 
 add_library (z_bundled STATIC
     adler32.c

diff --git a/thirdparty/zlib/zconf.h b/thirdparty/zlib/zconf.h
index b23438744283a74a4f723635522d4020e33b8bbd..ced649e20263def778815c81f997390be20ba205 100644 (file)
--- a/thirdparty/zlib/zconf.h
+++ b/thirdparty/zlib/zconf.h
@@ -356,7 +356,7 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 1    /* was set to #if 1 by ./configure */
+#if !defined(_MSC_VER)
 #  define Z_HAVE_UNISTD_H
 #endif