git: c022121396da - releng/13.1 - sys/contrib/zlib: Always define Z_U8 and Z_U4

From: Ed Maste <>
Date: Mon, 04 Apr 2022 17:24:39 UTC
The branch releng/13.1 has been updated by emaste:


commit c022121396da13d667c00ac588947647eac5f658
Author:     Xin LI <>
AuthorDate: 2022-04-03 18:45:38 +0000
Commit:     Ed Maste <>
CommitDate: 2022-04-04 16:54:20 +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
    PR:             kern/262977
    MFC after:      3 days
    (cherry picked from commit 0a21252adf11f7e839eabeb530e75cd1f9cd5386)
    Approved by:    re (gjb, early MFC)
    (cherry picked from commit 9587a10b420f9ef243f578b6938662ff6b558e86)
    Approved by:    re (gjb)
 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
+#if defined(Z_SOLO)
+#include <sys/types.h>
+#define Z_U8 __uint64_t
+#define Z_U4 __uint32_t