Merge PVCS #7739.

[mirror_edk2.git] / EdkModulePkg / Universal / Network / PxeBc / Dxe / pxe_bc_dhcp.c

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index 012b61cf372bb17eef2f8db7f4142aaf5ba259ac..57664d81e2cc502d396a92485dc2a7b957ace5d2 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -18,7 +18,7 @@ Abstract:
 --*/\r
 \r
 \r
-#include "bc.h"\r
+#include "Bc.h"\r
 \r
 STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;\r
 STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;\r
@@ -43,13 +43,6 @@ typedef union {
   UINT8                     *BytePtr;\r
 } UNION_PTR;\r
 \r
-//\r
-// 1 for Itanium-based, 0 for IA32\r
-//\r
-#define IA64SZ    ((sizeof (UINTN) / sizeof (UINT32)) - 1)\r
-\r
-#define SYS_ARCH  (SYS_ARCH_EFI32 - (SYS_ARCH_EFI32 - IA64) * IA64SZ)\r
-\r
 #pragma pack(1)\r
 //\r
 // option structure for DHCPREQUEST at end of DISCOVER options\r
@@ -2108,7 +2101,7 @@ DoDhcpDora (
     // now look for DHCP onlys and a Proxy\r
     //\r
     for (Index = 0; Index < NumOffers; ++Index) {\r
-      INT8  Index2;\r
+      UINT8  Index2;\r
 \r
       //\r
       // ignore proxies, bootps, non DHCP onlys, and bootable DHCPS\r