From nobody Sun Apr 3 21:40:26 2022 X-Original-To: dev-commits-src-main@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 DFA1C1A43CA6; Sun, 3 Apr 2022 21:40:28 +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 4KWnQ33kqfz3tMr; Sun, 3 Apr 2022 21:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649022028; 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=xK8/JRGUacGYh2KQ1hiSvk0SCrqAX+QLxdUu8ijSlPo=; b=iDv1z8jxQT6bxBGO1qHKUpIR+q2RDUdRNj3gPd8du7rkoJsDqtYL91GAMgizVoSaprfqVW Rds2NFnONMKTDd8c/PiHamheoWdaJTU6Fx3wD7y5PjPsMYUAP/NDasB6u9UlpZbSa+eDAK 9yKoEWtxk5XcbOaz7ccV9LnW7hKq0E/nhQZmZVl6wl8lcsYkYf40G8J4jgolBXNTUTWVDn PevUe9OQ7ycMpRZIcWCsP7hS4fyNlJRq2mjm3gaIpzLIrCWkTt97eh3mL8QErfPwepCMkR lIaIECtibsMLK5vebc4WnbmpnbJdM25GtEJELbqrPHzqVokmXhyPNR3hcvmCtw== 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 02AFE252BE; Sun, 3 Apr 2022 21:40:27 +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 233LeQh1003281; Sun, 3 Apr 2022 21:40:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233LeQvR003280; Sun, 3 Apr 2022 21:40:26 GMT (envelope-from git) Date: Sun, 3 Apr 2022 21:40:26 GMT Message-Id: <202204032140.233LeQvR003280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 0a21252adf11 - main - sys/contrib/zlib: Always define Z_U8 and Z_U4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a21252adf11f7e839eabeb530e75cd1f9cd5386 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649022028; 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=xK8/JRGUacGYh2KQ1hiSvk0SCrqAX+QLxdUu8ijSlPo=; b=jtOto+q8an/6y3sPEINNmQvsIGXaKqb5MfAywZkTorR/8BF/sh50fxMIqoruuzbMChU54+ scORcFrytMWDl27IPSsL37bvADdCkP0F/Dsd7gwyYvyaegtjLoLwxRENJVWcgXxZbmv1IR Yp0ax9fWBUIAW4WCi+/F5jhpiBbKLUNTI8YDCwbrMUQsLS0LDLtkjpi4BcTQcDI2DRlsI9 QS3YLmR6lMEbMZzC/N3lWOkIDbu/2O3ca59qj3Y2i66F4dGQayBOvWXoVNrnc0kVluFrtg LATE4r0AtFw4Y1I7ks54yx8J2Ee0k3hBGfNhohlgY8V+70bKpIYclocyO0xDvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649022028; a=rsa-sha256; cv=none; b=UJd0A2ZdtERLhANR72cosihdTuNE6TfahFlqKiLPmNgKwZ6wkTz2QWBmRSetTdF6SWx5h+ mv6Thh8oxuy/jdH3zlIgVP/Cef6kFQ7xFwzJywjLhITVwg0SGsBV2my0rm2SHQ20+GaC1M IZGq5JfX4R+7iXcWCQ8T4dfMSrB0COq1Fhjx5W2XFyyxSmv4zMGvYATLSyJWQSn2I+yh91 PPu6t9xyBng4JnKxEu5nQdGp2UATqCEQ388E1WRX8YiXRXdsVhPtjVuBRLjU1fD2HX+tyy d5SIAQuHj88kyshKAozD+IbuLG3t+YT4reYapy+fiFpykh+KUyvPdeaFDKxitA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=0a21252adf11f7e839eabeb530e75cd1f9cd5386 commit 0a21252adf11f7e839eabeb530e75cd1f9cd5386 Author: Xin LI AuthorDate: 2022-04-03 18:45:38 +0000 Commit: Xin LI 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 +#define Z_U8 __uint64_t +#define Z_U4 __uint32_t +#endif #endif /*