summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib/qtpatches.diff
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/zlib/qtpatches.diff')
-rw-r--r--src/3rdparty/zlib/qtpatches.diff4
1 files changed, 3 insertions, 1 deletions
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