From nobody Mon Apr 04 15:58:33 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F18AB1A93BFB; Mon, 4 Apr 2022 15:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KXFn56X5pz4xvJ; Mon, 4 Apr 2022 15:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649087913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdrBNtKO/ysSWrTQdn0n57jxwN0iUcJyTQ6GpcBcFfw=; b=c2AnuXJm18CYlmi6F0evtCBvberYeaX51OwSyYpcSxH94RtyFSvCNSg1TgJh7GLA8bCH3T A1qMbz92DXPUzmA271eHcodrgMjwlr7uS94HPcMo4Ms86F111Hd5H5IrsGTGmhfCU4UzKW Pu8F4bEW0VEUNFA9KtSrxDc1ZMKLa7R7I9w3y8DwCop53/mDz0jU6ninYHq4qpj1g3i4b1 AXl8essPYBRwc8GVZcyLGst+1mC+xopPj+/Ucc8mX4Zi4nARIab4FUHEGhMNVm8SgQKAuL yxoin+gSNL0p8cbMo5nJGWnm9tjGb5ieQ5aCMgpd284aTn3EAOK1X6RioqLCfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C02F314FBE; Mon, 4 Apr 2022 15:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 234FwXeD081560; Mon, 4 Apr 2022 15:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234FwX2d081559; Mon, 4 Apr 2022 15:58:33 GMT (envelope-from git) Date: Mon, 4 Apr 2022 15:58:33 GMT Message-Id: <202204041558.234FwX2d081559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9587a10b420f - stable/13 - sys/contrib/zlib: Always define Z_U8 and Z_U4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9587a10b420f9ef243f578b6938662ff6b558e86 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649087913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdrBNtKO/ysSWrTQdn0n57jxwN0iUcJyTQ6GpcBcFfw=; b=Ui4yhszNN5p8VnAnOHUpI4phAjOEwVo5N1EccHlWWI2vQp0wgBLjNNOz3tVTpZs/GwV8Tn +5+aqcP8jNFiyMUDcTJyS/AM9Grtmah6MA6l3H20kZj8xMcaD1POz/zEn29/ky2ZBwRzMe rBIiPxlH1q741/ByxGeROSEvdmtQYMEhrlVHo28CblTk5+fqOneDbl8n0LlbtU5juaWmmY eyCs75faXZcjQ5ygL9wS3ztIlWU2plVI/Vib2JpywSg4MmRjkNzd1zgojW903o+CduWR5d RCsdEsOKQEzIFrEdGRXqyEaELBisqoxcvU1A4YyQNnqjbpsROz1a0OIYE6kcgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649087913; a=rsa-sha256; cv=none; b=ubt8/PVIb194gRXroZ9mW4231SB99ST1c5Kttkropr4AMdUVGu52nMl2NEGrMi72UC2wyw /FlMuOCWtuIrdV4Fy7ncwUdidDbWdqa+hxj43LocRrM05zvCoVZNDjEaW+0arIbSo1GmRM MtujfJAmCAkWQRXlPOp1FEeTA7lI+0teOzUdzi6cO+x1QjKkE+996cHdDUkhlLuolDLqWd czc0zv4TP1pwJ3yCqRoTxMHvMlKpJNt8XdaeuX5iX20Ho1tGgRLSUF/EmosBAYn/yUg97r tCKNQfM70s5lwO8YvZnDimg2O/09BS3uqrhjQEqXzeQPBHYAfi00Kww+tFWUvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9587a10b420f9ef243f578b6938662ff6b558e86 commit 9587a10b420f9ef243f578b6938662ff6b558e86 Author: Xin LI AuthorDate: 2022-04-03 18:45:38 +0000 Commit: Ed Maste 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 +#define Z_U8 __uint64_t +#define Z_U4 __uint32_t +#endif #endif /*