From nobody Tue Apr 16 02:34:42 2024 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 4VJSmf6wvYz5HZqQ; Tue, 16 Apr 2024 02:34:42 +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 4VJSmf5YQ0z4HV9; Tue, 16 Apr 2024 02:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234882; 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=4SpBv0zqcTcv9kLco1ePT1isob/Rw8GMyiNzsETwM9A=; b=A3pkoW75SMqZ6rnZ1MYss5OD923BYlGXuYhU8w4cA4VFBsYAQt8v3PiYM/mscUTrp+nknJ SSmIZEt1yo38MsnqXos4KdpWOXX+tW1U6zxcEAafYS0jD2sCDwKFJ5JJnYX++qFnGqewiy h8945BO7M+8SWDv/ZkMqJhd2qmo7FZN6mYZixCDEsm8tbLLlDjUskRDmI14edoomzZPDxU nwgyXsfcMSAG5xw89dSM66yHhCzzirgYZ1LnxSinQgtVSW+c9QfAKCHDukjEpaMtRKepLR wk8Jz/ZWgcdJAS0SQup1k3451Zs+UCkMA3WGeDTfXHsbQRW+53jTNWc+0h3qpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713234882; a=rsa-sha256; cv=none; b=g6PhSeUBL6WXnxr84wpCYFTJ8rDdt8/E3UMm1PAsdExINmvJsGXugH1+6BeSsyc1/Fy9c+ ImyRB/ueFkaEa7XUd15zQce/pJz4yCHLHXOus2kTOusWHfvH+i6y3ed+AhgwoRhrN9jfXU E6C5WflmPlT2i9tTYBSGu6L4voDUcTpdsFoeGYf7C6/Tn7k+9SEB2/RhqgKdb64fz1b6oP tfT42E8KVr8WYKnylJIE2toPzPjq3YfOWTc+8B6jZH4e70NCjHKssd8dWDUQPBv00ZlZWF Zq6J8F6P0B6UULO3VaJ27IK4XTrGaC5s7TvcQNqZWI6TPpvljLX5MHrX4rqHyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234882; 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=4SpBv0zqcTcv9kLco1ePT1isob/Rw8GMyiNzsETwM9A=; b=gxNo8GadsUnZi0Bne0iz2oRriPNl2tn1myNaJvm6uZYR/GFod1OLPHvkyqy8tAe2jDUiZV v7UWnIQKUik4u+//HIoYdWBiZO0oOqYBwZbYLDh/oQapnyVtQCbTwHsXlSlqRHoXaslatT 5Mw4kv4CwW+mFaASBdIbah13TAuImv6r92mb3GgcXwZVWEeTFUZr34rBQ5PNVzrh31tWHT /TQA/ZdvxOAJHu6dZ4Kd4kefcMMtX02fxVuHIll9NYXFrBF0WI24YGVp8KjJg9mOEO6IrE NvKlUpwS3wcKuL3+NkLqx0MdtQCfqqqmnvQKJqPy1Kc+BOsmitMY1TDbd0hioQ== 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 4VJSmf59fwzQ63; Tue, 16 Apr 2024 02:34:42 +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 43G2YgN7037542; Tue, 16 Apr 2024 02:34:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G2Ygvk037539; Tue, 16 Apr 2024 02:34:42 GMT (envelope-from git) Date: Tue, 16 Apr 2024 02:34:42 GMT Message-Id: <202404160234.43G2Ygvk037539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: beab67c8f6b2 - stable/14 - stand/efi: Define ACPI_USE_SYSTEM_INTTYPES to be 1 instead of blank 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: beab67c8f6b227c621d059a19d7e45b8e5fab344 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=beab67c8f6b227c621d059a19d7e45b8e5fab344 commit beab67c8f6b227c621d059a19d7e45b8e5fab344 Author: Warner Losh AuthorDate: 2023-11-21 18:36:18 +0000 Commit: Warner Losh CommitDate: 2024-04-16 02:32:04 +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 (cherry picked from commit e4789047ffd1319be337711ae4b6c594378f31b2) --- 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 73c61f5dac71..9b691ce9ae98 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