git: 9587a10b420f - stable/13 - sys/contrib/zlib: Always define Z_U8 and Z_U4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Apr 2022 15:58:33 UTC
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9587a10b420f9ef243f578b6938662ff6b558e86 commit 9587a10b420f9ef243f578b6938662ff6b558e86 Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2022-04-03 18:45:38 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-04-04 15:58:10 +0000 sys/contrib/zlib: Always define Z_U8 and Z_U4 This is a temporary hack for zlib to make sure that the library still builds when building with Z_SOLO (used in kernel and loader), as zlib is depending on limits.h which is only available in STDC case. PR: kern/262977 MFC after: 3 days (cherry picked from commit 0a21252adf11f7e839eabeb530e75cd1f9cd5386) Approved by: re (gjb, early MFC) --- sys/contrib/zlib/zconf.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/contrib/zlib/zconf.h b/sys/contrib/zlib/zconf.h index 3536a8c263f8..283c77f93e65 100644 --- a/sys/contrib/zlib/zconf.h +++ b/sys/contrib/zlib/zconf.h @@ -12,6 +12,11 @@ #ifdef _KERNEL #define Z_SOLO #endif +#if defined(Z_SOLO) +#include <sys/types.h> +#define Z_U8 __uint64_t +#define Z_U4 __uint32_t +#endif #endif /*