1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zlib: Disable MSVC warning C4267

Browse Source 
Change-Id: Ifc51c1847841bb7172f79067facf0c7e425a042b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 89f51a06809b71a8965de3c70c99664b22d04f57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2021-04-21 10:51:58 +02:00 committed by Qt Cherry-pick Bot
parent 51a63306d1
commit 8abe8384f6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/zlib/qtpatches.diff vendored
View File

@ -26,12 +26,14 @@ diff -ruN orig/gzguts.h src/gzguts.h
+# ifndef _CRT_NONSTDC_NO_DEPRECATE +# ifndef _CRT_NONSTDC_NO_DEPRECATE
+# define _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE
+# endif +# endif
+// disable warnings like '=': conversion from 'size_t' to 'unsigned int', possible loss of data
+# pragma warning(disable: 4267)
+#endif +#endif
+ +
#ifdef _LARGEFILE64_SOURCE #ifdef _LARGEFILE64_SOURCE
# ifndef _LARGEFILE_SOURCE # ifndef _LARGEFILE_SOURCE
# define _LARGEFILE_SOURCE 1 # define _LARGEFILE_SOURCE 1
@@ -12,6 +21,15 @@ @@ -12,6 +23,15 @@
# endif # endif
#endif #endif

2
src/3rdparty/zlib/src/gzguts.h vendored
View File

@ -10,6 +10,8 @@
# ifndef _CRT_NONSTDC_NO_DEPRECATE # ifndef _CRT_NONSTDC_NO_DEPRECATE
# define _CRT_NONSTDC_NO_DEPRECATE # define _CRT_NONSTDC_NO_DEPRECATE
# endif # endif
// disable warnings like '=': conversion from 'size_t' to 'unsigned int', possible loss of data
# pragma warning(disable: 4267)
#endif #endif
#ifdef _LARGEFILE64_SOURCE #ifdef _LARGEFILE64_SOURCE