Sync BaseTool trunk (version r2423) into EDKII BaseTools. The change mainly includes:

[mirror_edk2.git] / BaseTools / Source / C / Common / FirmwareVolumeBuffer.c

diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
index c8586b407829c44c718b2cdda4a6ff7b5d4f0566..92060e2ca1008510fd64bc5b17ade5eac9282505 100644 (file)
--- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
@@ -553,7 +553,7 @@ Returns:
   EFI_FIRMWARE_VOLUME_HEADER *hdr = (EFI_FIRMWARE_VOLUME_HEADER*)Fv;\r
 \r
   EFI_FFS_FILE_HEADER *fhdr = NULL;\r
-  EFI_FVB_ATTRIBUTES FvbAttributes;\r
+  EFI_FVB_ATTRIBUTES_2 FvbAttributes;\r
   UINTN offset;\r
   UINTN fsize;\r
   UINTN newSize;\r
@@ -869,7 +869,7 @@ Returns:
   EFI_FIRMWARE_VOLUME_HEADER *hdr = (EFI_FIRMWARE_VOLUME_HEADER*)Fv;\r
 \r
   EFI_FFS_FILE_HEADER *fhdr = NULL;\r
-  EFI_FVB_ATTRIBUTES FvbAttributes;\r
+  EFI_FVB_ATTRIBUTES_2 FvbAttributes;\r
   UINTN fsize;\r
 \r
   EFI_STATUS Status;\r