From nobody Mon Apr 04 17:24:39 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 06C131A86AF5; Mon, 4 Apr 2022 17:24:41 +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 4KXHhS2F4yz3Dbv; Mon, 4 Apr 2022 17:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649093080; 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=G9dmhfh+EqDBFnwiGs3c1Lnoeu8NyrzF879x+0D1Rhg=; b=NzM3YmkEECCU5SgtD113MNutrpE25jTdTC1/XU99LicqrMa2t9L0JZTQbwsbGPxCrizVMg vjIAwuy7Mz6G9lc0fT84iWp/w/nkkh1w72g/979gxGNmzraTiwVxUi46x6lH+PHfVQ1Xne JbwlEWf7CMIm8cjLVAv7l1+bZQOs7O/yvkdLxkfuHaI1FYHbBm2bVSn/g9WPzkuh28Vf9Y ZnIADzMSVLNrd8f8eZQ8nzxAPH+Zln96nyAwtRFAzWWJCsqbt64eiWagrO8mTlgVGRkiMt DnyMSp5j2uZmbHsHqH+AgFPaoSLRLiKmAPoJChXyP2lraPRSrEN43ZjLFLOi2Q== 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 B5A3715FE7; Mon, 4 Apr 2022 17:24:39 +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 234HOd4Y002663; Mon, 4 Apr 2022 17:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234HOdEb002662; Mon, 4 Apr 2022 17:24:39 GMT (envelope-from git) Date: Mon, 4 Apr 2022 17:24:39 GMT Message-Id: <202204041724.234HOdEb002662@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: c022121396da - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: c022121396da13d667c00ac588947647eac5f658 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649093080; 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=G9dmhfh+EqDBFnwiGs3c1Lnoeu8NyrzF879x+0D1Rhg=; b=brjHxfeXFhCREez2+yTtlp4OZ7lnkui0fszNt1Erb6vGArmTyZ/KhicWTHmab0NbUFRQqr 8Jp855eqrjhdaq8XU9P8gJ1VFOSQESED0cXxdSSzKnmbvyh9i8ue4y4rS+AaBQIDaZbDYP KERdYEAqVT4LjllWnKo1IWuSx2+67LuudViixQ0PN4LBEvm+9V78IoGoygi/vOohLd+dx3 abfMd6ZKRXA27YwK7ztfVVreBUJQtZ2Udd6IGDO/aujQsjl1VcoM31V+eXQ8knUWRZKmpG x4iY59l2sA8kTnPgKQEntzcMGpA5MCxTwTi9Ls1FHup7n/KUoXPnqYABwVYjoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649093080; a=rsa-sha256; cv=none; b=hthS7xxfiI9fsTVM4r89UkBBwsLm9s+Hm7D5B4rJopersMDHTcPHPNeJQlrCsWoCdtWWd7 rRxg8bMvx50SHeh0nYNkyQ1400IaKg6uuqtdMpOZGF7rZXXXa/yhfbbzjqMfsEMWDJ3mv+ RaNlS6PS/m3Pwe+RCUGvjp57mrhr4vdCxWtTxIyj/V9LDIlcXKMS1WMORCXJmERSVM1677 7cUzjZfrbxVx8cag0uYFYbtPd3epveYSN8dn8l/JyyeKPUZevDmD2Yf6WzCTgNhUeAlx7w /+88CJX0nI0yfd01rcGYerK2YkEquMdjXnmzVt3e/neQDBl6OFlIv+xCZZIJzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c022121396da13d667c00ac588947647eac5f658 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 case. 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 #endif +#if defined(Z_SOLO) +#include +#define Z_U8 __uint64_t +#define Z_U4 __uint32_t +#endif #endif /*