From 89f51a06809b71a8965de3c70c99664b22d04f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 21 Apr 2021 10:51:58 +0200 Subject: zlib: Disable MSVC warning C4267 Pick-to: 6.1 Change-Id: Ifc51c1847841bb7172f79067facf0c7e425a042b Reviewed-by: Friedemann Kleint --- src/3rdparty/zlib/qtpatches.diff | 4 +++- src/3rdparty/zlib/src/gzguts.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty/zlib/qtpatches.diff b/src/3rdparty/zlib/qtpatches.diff index 105dda967c..98a7b2c205 100644 --- a/src/3rdparty/zlib/qtpatches.diff +++ b/src/3rdparty/zlib/qtpatches.diff @@ -26,12 +26,14 @@ diff -ruN orig/gzguts.h src/gzguts.h +# ifndef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +# endif ++// disable warnings like '=': conversion from 'size_t' to 'unsigned int', possible loss of data ++# pragma warning(disable: 4267) +#endif + #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 -@@ -12,6 +21,15 @@ +@@ -12,6 +23,15 @@ # endif #endif diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h index 20de7cb4ce..055de5100f 100644 --- a/src/3rdparty/zlib/src/gzguts.h +++ b/src/3rdparty/zlib/src/gzguts.h @@ -10,6 +10,8 @@ # ifndef _CRT_NONSTDC_NO_DEPRECATE # define _CRT_NONSTDC_NO_DEPRECATE # endif +// disable warnings like '=': conversion from 'size_t' to 'unsigned int', possible loss of data +# pragma warning(disable: 4267) #endif #ifdef _LARGEFILE64_SOURCE -- cgit v1.2.3