From nobody Mon Feb 9 02:28:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44842+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44842+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564716196; cv=none; d=zoho.com; s=zohoarc; b=lN7gzu5iCjku1Kzd3zHIjuC+sqLfkAuFGI5wf29iITwOV/89cI1oXk629z+6rXniSrM1O/5zCIQxMz6ka6V1HDcWj/1GuR7jEG1MQAWloKN3cL1SqYYfhVdkPPS1ToWpUFBmbOelfNwuXsiPtDj0DrmGZH1o2zukLMyr/i73vf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564716196; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=MAIcDVkG58vEa4L9OSoUaPEEEboc6EPfmdQ5cyY3abE=; b=TSzEt2NK1ALGU+JdHGX2NMKM/tg5oCWoCG5MnmSUj9pCmljfPQT0OufkC2tynfj+bB678OJd3CXSCJbc3FYKeyjz5p/sTqYotS5OVN1s4D21p08ijtocpWXsFfyFr89RW1MEsYMrxHru8BvU3sZonAexFLQzeihBvuEjs76apIA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44842+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 156471619689862.097169671839765; Thu, 1 Aug 2019 20:23:16 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Thu, 01 Aug 2019 20:23:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 20:23:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,336,1559545200"; d="scan'208";a="256855691" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.130.221]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2019 20:23:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jordan Justen , Andrew Fish Subject: [edk2-devel] [Patch 2/4] EmulatorPkg/Unix/Host: Fix NetworkPkg dependencies Date: Thu, 1 Aug 2019 20:23:07 -0700 Message-Id: <20190802032309.29000-3-michael.d.kinney@intel.com> In-Reply-To: <20190802032309.29000-1-michael.d.kinney@intel.com> References: <20190802032309.29000-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564716196; bh=3b4RpnlkslJ0KKm/NYvq923YxfLxCFNSgMEt4scFF9U=; h=Cc:Date:From:Reply-To:Subject:To; b=rFFMSfdiHiMMR6mg7ZrOY7rIohDqtidqRQ6+gEi6GzDCKFHatlrAGIJW7iRDeopmt1R pfnpwVJ3lB/hgAIqsm8wt4fzokE9Zf4NFM+pSarq707b9Q3At5n+t4/p2j/RqeOXUMJRH Kva+JWlS3v+RW3t0o3E5k+jCEG4vsOT1SuY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D2046 * Add NetworkPkg to UNIX Host.inf dependencies * Fix MacOS redefinition of NTOHLL and HTONLL macros between EDK II and standard includes in UNIX Host.h. Cc: Jordan Justen Cc: Andrew Fish CcM: Ray Ni Signed-off-by: Michael D Kinney --- EmulatorPkg/Unix/Host/Host.h | 6 +++++- EmulatorPkg/Unix/Host/Host.inf | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index c26e979efa..9791cf8c37 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -14,7 +14,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Name mangle to prevent build errors. I.e conflicts between EFI and OS // #define NTOHL _UNIX_EFI_NAME_MANGLE_NTOHL_ +#define NTOHLL _UNIX_EFI_NAME_MANGLE_NTOHLL_ #define HTONL _UNIX_EFI_NAME_MANGLE_HTONL_ +#define HTONLL _UNIX_EFI_NAME_MANGLE_HTONLL_ #define NTOHS _UNIX_EFI_NAME_MANGLE_NTOHS_ #define HTONS _UNIX_EFI_NAME_MANGLE_HTOHS_ #define B0 _UNIX_EFI_NAME_MANGLE_B0_ @@ -72,7 +74,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include =20 #undef NTOHL +#undef NTOHLL #undef HTONL +#undef HTONLL #undef NTOHS #undef HTONS #undef B0 diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf index 71732d89fc..efe8a2b5e5 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -46,6 +46,7 @@ [Sources.IA32] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + NetworkPkg/NetworkPkg.dec EmulatorPkg/EmulatorPkg.dec =20 [LibraryClasses] --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44842): https://edk2.groups.io/g/devel/message/44842 Mute This Topic: https://groups.io/mt/32687217/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-