From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) 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 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" 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: [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> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190802032309.29000-1-michael.d.kinney@intel.com> References: <20190802032309.29000-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit https://bugzilla.tianocore.org/show_bug.cgi?id=2046 * 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 -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.
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 #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 [LibraryClasses] -- 2.21.0.windows.1