Permalink
Browse files

zlib: disable warning 4142 on MSVC

This is about benign redefinition of types. We're not interested in it.
  • Loading branch information...
1 parent 4f8ac21 commit b42ff7c0169c002d7ab8ba13d9d0b6d59a7bfbc9 @carlosmn carlosmn committed Jun 11, 2014
Showing with 1 addition and 0 deletions.
  1. +1 −0 deps/zlib/zconf.h
View
@@ -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 */

0 comments on commit b42ff7c

Please sign in to comment.