Commit b42ff7c0169c002d7ab8ba13d9d0b6d59a7bfbc9
2014-06-11T18:22:46
zlib: disable warning 4142 on MSVC This is about benign redefinition of types. We're not interested in it.
diff --git a/deps/zlib/zconf.h b/deps/zlib/zconf.h
index e87f145..229c400 100644
--- a/deps/zlib/zconf.h
+++ b/deps/zlib/zconf.h
@@ -14,6 +14,7 @@
* forms, we didn't write zlib */
#if defined(_MSC_VER)
# pragma warning( disable : 4131 )
+# pragma warning( disable : 4142 ) /* benign redefinition of type */
#endif
/* Maximum value for memLevel in deflateInit2 */