git: 0a21252adf11 - main - sys/contrib/zlib: Always define Z_U8 and Z_U4

From: Xin LI <delphij_at_FreeBSD.org>
Date: Sun, 03 Apr 2022 21:40:26 UTC
The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/src/commit/?id=0a21252adf11f7e839eabeb530e75cd1f9cd5386

commit 0a21252adf11f7e839eabeb530e75cd1f9cd5386
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2022-04-03 18:45:38 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2022-04-03 21:38:31 +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
---
 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
 
 /*