From nobody Tue Apr 05 19:43:29 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 0AC381A903C1; Tue, 5 Apr 2022 19:43:30 +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 4KXyk96sXkz4VMH; Tue, 5 Apr 2022 19:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649187810; 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=+zQE4Dc8kLdoIFWdkBzJvBwzGLAGbH60ivTdc1I2sxQ=; b=x7mX2jEB3p1UkoajQYxCp60bnO5/ge3MwNtL69XFXwOe50aoqkUQH4QTYYA+GHF+LFfeWN 9XCYJFR9j7oWwSr6ES2wtIn5JjYfTZTYhYVA9bJGmWD2e3v4ctlcM9OEmVvSYvjfw2sHKA SPGheJOabOIKqybEa95N9fkhcmEGjycpvON1bB85KuPxWGBz+0GskkUMq/ltNNaSM+xMj6 Cp0wIt2NT91gWQAl4En91bEhxcmJO3FGPk5OuX6n6lmkLWyj6TIqfSHyHCuAlT+vvuWD6w MN16TBwTBPncsN8G88TBUNfU7MfbOGCNakj12FJuOunse6HP/kHsKfNfrbLAkw== 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 CCE034BDF; Tue, 5 Apr 2022 19:43:29 +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 235JhT1T038866; Tue, 5 Apr 2022 19:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235JhTeo038865; Tue, 5 Apr 2022 19:43:29 GMT (envelope-from git) Date: Tue, 5 Apr 2022 19:43:29 GMT Message-Id: <202204051943.235JhTeo038865@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: ca211d5f6499 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: ca211d5f64999e5efe6ac3459d912aa6f8d0546e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649187810; 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=+zQE4Dc8kLdoIFWdkBzJvBwzGLAGbH60ivTdc1I2sxQ=; b=tOD9lSWNHi2TGWSx2i1RzcYrxEKDKVjjkp6hHaooMJJvp1TmEokhC3LCXEX9edYU37FlXI 36EKkpE+lYyJXEvlm5Jk3EISN/TS18E2SbWxt1F7Xy1v+4oD80JjeR/N6dMMO1ItMuQWTT N6t7BWMt8FAUs7UNUtE0dXKxWCH+7mu04c0MLj0G3RJQmW1ue22Z2ql6eHfqzntq3tHlf3 Nz6IxGW0ANkUTN4oQMssSYq/pyT3mvO3W9kaR7/ctpsrIeprwGVh/ljYgXmDmGUNWpBWIC BKMZp23+vSb92rVwY+DXYY8gSz8WhkVGo+7zXdTG76v0aLTxlK8gD+Ka2TrQ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649187810; a=rsa-sha256; cv=none; b=efzUx2gxVCPwubnkAtgbfl0MwoIB83V0OVnpHa457qVfObZ3J+36nJiq46v40isRyuDkpW MumHbmgWQXknFwTdbqzibQeT/bhkw77OWXME7kH7BxzNke49XMw9o2MavzpXY6ARgf9AoB Eaf3/0HhFDqYBrKB7U5Ufgi44LnyDlS/7Vd0plDwVxn0383y7XL+regBgDrv8tm1meLokX Q0HSw12FZ6K5q5vQqtBuKEmXwU/YaZMhx94bhwjFpqIY/W1hOmAhaGuL878XIhrTJWb6gs wDtZk95xE54iKfkpPvf5M63zRoICPEwhS7plYh8gU5kiBGjT+hwWjLNy1FXU9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ca211d5f64999e5efe6ac3459d912aa6f8d0546e commit ca211d5f64999e5efe6ac3459d912aa6f8d0546e Author: Xin LI AuthorDate: 2022-04-03 18:45:38 +0000 Commit: Ed Maste CommitDate: 2022-04-05 19:41:58 +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) --- 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 0654395f3fca..842402232cc0 100644 --- a/sys/contrib/zlib/zconf.h +++ b/sys/contrib/zlib/zconf.h @@ -8,6 +8,11 @@ #ifndef ZCONF_H #define ZCONF_H +#if defined(Z_SOLO) +#include +#define Z_U8 __uint64_t +#define Z_U4 __uint32_t +#endif /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.