From b42ff7c0169c002d7ab8ba13d9d0b6d59a7bfbc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Wed, 11 Jun 2014 18:22:46 +0200 Subject: zlib: disable warning 4142 on MSVC This is about benign redefinition of types. We're not interested in it. --- deps/zlib/zconf.h | 1 + 1 file changed, 1 insertion(+) (limited to 'deps') diff --git a/deps/zlib/zconf.h b/deps/zlib/zconf.h index e87f145fe..229c40024 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 */ -- cgit v1.2.3