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 <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 75cbd3ac17c2fdc36fcd8215baaabda53cb481c0..6a34b6f553649f2a110a8e0ec5ff978025863e5a 100644 (file)
--- 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.
 \r
 #include <Guid/FfsSectionAlignmentPadding.h>\r
 \r
+#include "WinNtInclude.h"\r
 #include "GenFvInternalLib.h"\r
 #include "FvLib.h"\r
 #include "PeCoffLib.h"\r
-#include "WinNtInclude.h"\r
 \r
 #define ARMT_UNCONDITIONAL_JUMP_INSTRUCTION       0xEB000000\r
 #define ARM64_UNCONDITIONAL_JUMP_INSTRUCTION      0x14000000\r

diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h
index 39c5408dd4f8d9af763e44873ed882f1220e584d..e1282b3a89878c60ce46aaffd3f92d4858b3f94a 100644 (file)
--- a/BaseTools/Source/C/Include/Common/BaseTypes.h
+++ b/BaseTools/Source/C/Include/Common/BaseTypes.h
@@ -122,6 +122,8 @@
 \r
 #endif\r
 \r
+#ifndef GUID_DEFINED\r
+#define GUID_DEFINED\r
 ///\r
 /// 128 bit buffer containing a unique identifier value.\r
 /// Unless otherwise specified, aligned on a 64 bit boundary.\r
@@ -132,6 +134,7 @@ typedef struct {
   UINT16  Data3;\r
   UINT8   Data4[8];\r
 } GUID;\r
+#endif\r
 \r
 ///\r
 /// 4-byte buffer. An IPv4 internet protocol address.\r