tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michael D Kinney 2019-08-01 18:06:04 -07:00
parent 113a7d9ec9
commit b98504b514
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EmulatorPkg/Unix/Host/Host.h
View File

@ -1,6 +1,6 @@
/*++ @file /*++ @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> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent 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 // Name mangle to prevent build errors. I.e conflicts between EFI and OS
// //
#define NTOHL _UNIX_EFI_NAME_MANGLE_NTOHL_ #define NTOHL _UNIX_EFI_NAME_MANGLE_NTOHL_
#define NTOHLL _UNIX_EFI_NAME_MANGLE_NTOHLL_
#define HTONL _UNIX_EFI_NAME_MANGLE_HTONL_ #define HTONL _UNIX_EFI_NAME_MANGLE_HTONL_
#define HTONLL _UNIX_EFI_NAME_MANGLE_HTONLL_
#define NTOHS _UNIX_EFI_NAME_MANGLE_NTOHS_ #define NTOHS _UNIX_EFI_NAME_MANGLE_NTOHS_
#define HTONS _UNIX_EFI_NAME_MANGLE_HTOHS_ #define HTONS _UNIX_EFI_NAME_MANGLE_HTOHS_
#define B0 _UNIX_EFI_NAME_MANGLE_B0_ #define B0 _UNIX_EFI_NAME_MANGLE_B0_
@ -72,7 +74,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <utime.h> #include <utime.h>
#undef NTOHL #undef NTOHL
#undef NTOHLL
#undef HTONL #undef HTONL
#undef HTONLL
#undef NTOHS #undef NTOHS
#undef HTONS #undef HTONS
#undef B0 #undef B0

1
EmulatorPkg/Unix/Host/Host.inf
View File

@ -46,6 +46,7 @@
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
EmulatorPkg/EmulatorPkg.dec EmulatorPkg/EmulatorPkg.dec
[LibraryClasses] [LibraryClasses]