diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-11 18:22:46 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-11 18:33:55 +0200 |
| commit | b42ff7c0169c002d7ab8ba13d9d0b6d59a7bfbc9 (patch) | |
| tree | a6e241f4916c1405569258159b4bec05ed43d5f4 | |
| parent | 4f8ac2163bd264407313a01b11c372b00ce90af7 (diff) | |
| download | libgit2-cmn/update-zlib.tar.gz | |
zlib: disable warning 4142 on MSVCcmn/update-zlib
This is about benign redefinition of types. We're not interested in it.
| -rw-r--r-- | deps/zlib/zconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |