diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
| commit | da6e958319e95fe564d3b30c931492dd666bfaff (patch) | |
| tree | 16ac1556a573daeba5c9c4b795f86aa166ffe467 /src/3rdparty/zlib/qtpatches.diff | |
| parent | 29400a683f96867133b28299c0d0bd6bcf40df35 (diff) | |
| parent | a96fc76fa78f3500266b3a34016f9e1bd29b319c (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: Iac056a5e9f59fc8d1929171c18039aeb45be22b8
Diffstat (limited to 'src/3rdparty/zlib/qtpatches.diff')
| -rw-r--r-- | src/3rdparty/zlib/qtpatches.diff | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/zlib/qtpatches.diff b/src/3rdparty/zlib/qtpatches.diff index 681697afb0..34a8a693ec 100644 --- a/src/3rdparty/zlib/qtpatches.diff +++ b/src/3rdparty/zlib/qtpatches.diff @@ -74,7 +74,17 @@ diff -ruN orig/zconf.h src/zconf.h /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. -@@ -136,6 +139,7 @@ +@@ -38,6 +41,9 @@ + # define crc32 z_crc32 + # define crc32_combine z_crc32_combine + # define crc32_combine64 z_crc32_combine64 ++# define crc32_combine_gen z_crc32_combine_gen ++# define crc32_combine_gen64 z_crc32_combine_gen64 ++# define crc32_combine_op z_crc32_combine_op + # define crc32_z z_crc32_z + # define deflate z_deflate + # define deflateBound z_deflateBound +@@ -136,6 +142,7 @@ # endif # define zlibCompileFlags z_zlibCompileFlags # define zlibVersion z_zlibVersion @@ -82,7 +92,7 @@ diff -ruN orig/zconf.h src/zconf.h /* all zlib typedefs in zlib.h and zconf.h */ # define Byte z_Byte -@@ -431,7 +435,7 @@ +@@ -431,7 +438,7 @@ typedef unsigned long z_crc_t; #endif |