From nobody Tue Nov 21 18:38:52 2023 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 4SZY7110jwz524wJ; Tue, 21 Nov 2023 18:38:53 +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 4SZY710T3Wz4q03; Tue, 21 Nov 2023 18:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700591933; 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=tXML+MrgYfrbEaJRRt31iBcSNTtZnUCEefLPofuJ3nE=; b=ZgnOOAKQSWt4Ti7wWDKgSMkuSc7SdcQV3x6TWqvbDhoO1SgYHzoHW0PHp3QIP5h9ngMaW1 bFb7M74XC1LunE7d9PSxU9f/j+3AK2vqMQfpnYAdFee6u019oSZF/Jw2cpWm+SSACeDHf7 UKmLrNfsbgtHoLDe+z3fcjpgUZ+hXUiJ/S3Z2DOW3xfUm+xJOh17Z8fpwKrNVK60gdgGrz RwDu98hO7UJV+snUjT14YP4r3RIIHKJGI5h1tL/TqO0lK2QlxPIM9kvwFiacfMCmSlHgJ0 3Srv32SFLddWaZ2XdPizKm8nwnPl3J0ijiwkGdHno1/Cx+8yInmd9Am0P0AvKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700591933; 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=tXML+MrgYfrbEaJRRt31iBcSNTtZnUCEefLPofuJ3nE=; b=EclAO5BaYUIguuYMGqZ6jMqL/5lKyvOvZo6NpzFeh29VniAXVDmDBkR9rC/CL2QOofgmbi 0T2/SXO+eVbYvnlm6W5oiiQeONWsfWb/pHMYgO30OiWUGEmVw6hCGUKSYVTSVp/C/8w3ti fiRnsNQT6sP1/tbtVEuqDRXRxlRg2gDqwohlJgEIZUOfnVQN5oxsDAOYErOeQ8Begi92oJ HIlRa9goWeYsDpG7QdDHIYbTgN9fw/yz2O2a6ITEcozSlvd38ORM16j45S1Uwz30Ts09ct W2qd/aNmioW4eZsbPhnv3zSdhx/K4tS24aA8T7soxKWpPrS0zdZ/idCdsxQ+xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700591933; a=rsa-sha256; cv=none; b=x/p0DkRC/05YZaBhitLxWrSUYOEq+TTiw2cDrvsjyl2PRo4mi10JvefseAfH0zuwiJpAak jsZIG82a7jN0NUHqiQzzBO5NN+R5AYhsE4fLGfqdpzTdyAevoAQVoczVQ4A9ACok9KZ68f xP+txDHv2igJPm/jC2kCc6s1nwz9ZtNu5cpjFSu3AwQG3bbzKyNn2EERM05IONzY1dJ2AT 7lrsF4hXgy/P+BqQ7KemEYMciJtzbP/35G4HTOiVnZmDTYnwlAVaasS7AlLSBpZhrxgH2M 3qiJNaZRA0gt+PLl7iOJUD92oQNNyXw95WBrgrrjlSc57h15iIeoCK02tY2zgw== 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 4SZY706dYtzmLl; Tue, 21 Nov 2023 18:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ALIcqng046307; Tue, 21 Nov 2023 18:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALIcqS0046304; Tue, 21 Nov 2023 18:38:52 GMT (envelope-from git) Date: Tue, 21 Nov 2023 18:38:52 GMT Message-Id: <202311211838.3ALIcqS0046304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e4789047ffd1 - main - stand/efi: Define ACPI_USE_SYSTEM_INTTYPES to be 1 instead of blank 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4789047ffd1319be337711ae4b6c594378f31b2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e4789047ffd1319be337711ae4b6c594378f31b2 commit e4789047ffd1319be337711ae4b6c594378f31b2 Author: Warner Losh AuthorDate: 2023-11-21 18:36:18 +0000 Commit: Warner Losh CommitDate: 2023-11-21 18:38:46 +0000 stand/efi: Define ACPI_USE_SYSTEM_INTTYPES to be 1 instead of blank To avoid a redefinition warning... This needs to be redone correctly, but this gets amd64 building again... My amd64 environment is polluted with something that caues earlier failures which I ignored... Fixes: 488bc7e9a777 Sponsored by: Netflix --- stand/efi/loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 6514fd6cd8ce..a650abb3b68c 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -60,7 +60,7 @@ #include "efizfs.h" #include "framebuffer.h" -#define ACPI_USE_SYSTEM_INTTYPES +#define ACPI_USE_SYSTEM_INTTYPES 1 #include "platform/acfreebsd.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE