Please help to update copyright year when push the patch. thanks. Reviewed-by: Yonghong Zhu <[email protected]>
Best Regards, Zhu Yonghong -----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of Liming Gao Sent: Tuesday, February 27, 2018 4:57 PM To: [email protected] Subject: [edk2] [Patch] BaseTools: Resolve BaseTools C tool build failure New GUID definition is conflicted with GUID in Windows Kits guiddef.h. GUID definition will be defined when it is undefined. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao <[email protected]> --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 2 +- BaseTools/Source/C/Include/Common/BaseTypes.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 75cbd3a..6a34b6f 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -34,10 +34,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/FfsSectionAlignmentPadding.h> +#include "WinNtInclude.h" #include "GenFvInternalLib.h" #include "FvLib.h" #include "PeCoffLib.h" -#include "WinNtInclude.h" #define ARMT_UNCONDITIONAL_JUMP_INSTRUCTION 0xEB000000 #define ARM64_UNCONDITIONAL_JUMP_INSTRUCTION 0x14000000 diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h index 39c5408..e1282b3 100644 --- a/BaseTools/Source/C/Include/Common/BaseTypes.h +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h @@ -122,6 +122,8 @@ #endif +#ifndef GUID_DEFINED +#define GUID_DEFINED /// /// 128 bit buffer containing a unique identifier value. /// Unless otherwise specified, aligned on a 64 bit boundary. @@ -132,6 +134,7 @@ typedef struct { UINT16 Data3; UINT8 Data4[8]; } GUID; +#endif /// /// 4-byte buffer. An IPv4 internet protocol address. -- 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
