diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2024-01-23 16:37:12 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-25 14:05:23 +0000 |
| commit | 1579f19cf71aa220da3e8f7417a22baeb87a0f65 (patch) | |
| tree | 8c0c4b65cf8a43c2d31f668451c113d174b55f74 /src/3rdparty/zlib/src/gzguts.h | |
| parent | 83871413636407f196c2ef7ca4e5b0a846c646ec (diff) | |
Update Zlib to 1.3.1
[ChangeLog][Third-Party Code] zlib was updated to version 1.3.1.
Task-number: QTBUG-121325
Fixes: QTBUG-121444
Pick-to: 6.7 6.6.2 6.6 6.5 6.2 5.15
Change-Id: I0a72b7966916ccb825c7a8ae251e09b2914f0cf4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Diffstat (limited to 'src/3rdparty/zlib/src/gzguts.h')
| -rw-r--r-- | src/3rdparty/zlib/src/gzguts.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h index 4c7c9f1225..5bf6b7d481 100644 --- a/src/3rdparty/zlib/src/gzguts.h +++ b/src/3rdparty/zlib/src/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004-2019 Mark Adler + * Copyright (C) 2004-2024 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -216,9 +216,5 @@ char ZLIB_INTERNAL *gz_strwinerror(DWORD error); /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t value -- needed when comparing unsigned to z_off64_t, which is signed (possible z_off64_t types off_t, off64_t, and long are all signed) */ -#ifdef INT_MAX -# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) -#else unsigned ZLIB_INTERNAL gz_intmax(void); -# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) -#endif +#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) |