Skip to content

Commit

Permalink
zlib: disable warning 4142 on MSVC
Browse files Browse the repository at this point in the history
This is about benign redefinition of types. We're not interested in it.
  • Loading branch information
carlosmn committed Jun 11, 2014
1 parent 4f8ac21 commit b42ff7c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions deps/zlib/zconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit b42ff7c

Please sign in to comment.