--- qt-everywhere-src-5.15.14.old/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/compression_utils_portable.h +++ qt-everywhere-src-5.15.14/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/compression_utils_portable.h @@ -19,6 +19,10 @@ #include "zlib.h" #endif +#ifndef uLong +#define uLong unsigned long +#endif + namespace zlib_internal { enum WrapperType { --- qt-everywhere-src-5.15.14.old/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/zip.h +++ qt-everywhere-src-5.15.14/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/zip.h @@ -17,6 +17,10 @@ #include "base/time/time.h" #include "build/build_config.h" +#ifndef uLong +#define uLong unsigned long +#endif + namespace base { class File; } --- qt-everywhere-src-5.15.14.old/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc +++ qt-everywhere-src-5.15.14/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc @@ -31,6 +31,10 @@ #endif // defined(OS_POSIX) #endif // defined(USE_SYSTEM_MINIZIP) +#ifndef uLong +#define uLong unsigned long +#endif + namespace { #if defined(OS_WIN) ==== end of patch ==== --- qt-everywhere-src-5.15.14.old/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/compression_utils_portable.cc +++ qt-everywhere-src-5.15.14/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/compression_utils_portable.cc @@ -11,6 +11,20 @@ #include #include +#ifndef Z_DEFAULT_STRATEGY +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +#endif + namespace zlib_internal { // The difference in bytes between a zlib header and a gzip header. ==== end of patch ==== --- qt-everywhere-src-5.15.14.old/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc +++ qt-everywhere-src-5.15.14/qtwebengine/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc @@ -31,6 +31,20 @@ #endif // defined(OS_POSIX) #endif // defined(USE_SYSTEM_MINIZIP) +#ifndef Z_DEFAULT_STRATEGY +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +#endif + namespace { #if defined(OS_WIN) ==== end of patch ====