zlib: Disable MSVC warning C4267
Pick-to: 6.1 Change-Id: Ifc51c1847841bb7172f79067facf0c7e425a042b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
parent
c58be606dd
commit
89f51a0680
4
src/3rdparty/zlib/qtpatches.diff
vendored
4
src/3rdparty/zlib/qtpatches.diff
vendored
@ -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
|
||||
|
||||
|
2
src/3rdparty/zlib/src/gzguts.h
vendored
2
src/3rdparty/zlib/src/gzguts.h
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user