From: Yonghong Zhu <yonghong.zhu@intel.com>
Date: Thu, 1 Mar 2018 07:04:51 +0000 (+0800)
Subject: BaseTools: update DNS_DEVICE_PATH/URI_DEVICE_PATH definition
X-Git-Tag: edk2-stable201903~2268
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=20203d3f98d671d7d7d78f33bbb02cf1d1b3cabe

BaseTools: update DNS_DEVICE_PATH/URI_DEVICE_PATH definition

Update this two definition to align with MdePkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---

diff --git a/BaseTools/Source/C/Include/Protocol/DevicePath.h b/BaseTools/Source/C/Include/Protocol/DevicePath.h
index a5d8eea9bc..68bb37e479 100644
--- a/BaseTools/Source/C/Include/Protocol/DevicePath.h
+++ b/BaseTools/Source/C/Include/Protocol/DevicePath.h
@@ -5,7 +5,7 @@
   from a software point of view. The path must persist from boot to boot, so
   it can not contain things like PCI bus numbers that change from boot to boot.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under
 the terms and conditions of the BSD License that accompanies this distribution.
 The full text of the license may be found at
@@ -38,6 +38,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #pragma pack(1)
 
+#if defined(_MSC_EXTENSIONS)
+//
+// Disable warning when last field of data structure is a zero sized array.
+//
+#pragma warning ( disable : 4200 )
+#endif
+
 /**
   This protocol can be used on any device handle to obtain generic path/location
   information concerning the physical device or logical device. If the handle does
@@ -830,7 +837,7 @@ typedef struct {
   ///
   /// Instance of the DNS server address.
   ///
-  EFI_IP_ADDRESS                  DnsServerIp[1024];
+  EFI_IP_ADDRESS                  DnsServerIp[];
 } DNS_DEVICE_PATH;
 
 ///
@@ -842,7 +849,7 @@ typedef struct {
   ///
   /// Instance of the URI pursuant to RFC 3986.
   ///
-  CHAR8                           Uri[1024];
+  CHAR8                           Uri[];
 } URI_DEVICE_PATH;
 
 ///