diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-08-01 18:06:04 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-08-06 09:29:26 -0700 |
| commit | b98504b51455d7ccc19d6bd6a0db3acfa4756547 (patch) | |
| tree | 20b891b7923bfa2a152b4601a5c0580920fdd812 /EmulatorPkg/Unix | |
| parent | 113a7d9ec900860cdb7cd50a218761fa4c31577c (diff) | |
| download | edk2-b98504b51455d7ccc19d6bd6a0db3acfa4756547.tar.gz edk2-b98504b51455d7ccc19d6bd6a0db3acfa4756547.tar.bz2 edk2-b98504b51455d7ccc19d6bd6a0db3acfa4756547.zip | |
EmulatorPkg/Unix/Host: Fix NetworkPkg dependencies
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 <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'EmulatorPkg/Unix')
| -rw-r--r-- | EmulatorPkg/Unix/Host/Host.h | 6 | ||||
| -rw-r--r-- | EmulatorPkg/Unix/Host/Host.inf | 1 |
2 files changed, 6 insertions, 1 deletions
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.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
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 <utime.h>
#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 @@ [Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ NetworkPkg/NetworkPkg.dec
EmulatorPkg/EmulatorPkg.dec
[LibraryClasses]
|