summaryrefslogtreecommitdiffstats
path: root/BaseTools/Source/C/Include
diff options
context:
space:
mode:
authorLiming Gao <liming.gao@intel.com>2018-02-27 16:56:48 +0800
committerLiming Gao <liming.gao@intel.com>2018-02-27 18:34:03 +0800
commit006c2647dc60cd7e9d32c3555a3bf7cfd890ddd6 (patch)
tree56313206d53d4cecd667f5062cff61e706febd37 /BaseTools/Source/C/Include
parent78647b92287f4a2d7f7ade3fa68f19c345718f02 (diff)
downloadedk2-006c2647dc60cd7e9d32c3555a3bf7cfd890ddd6.tar.gz
edk2-006c2647dc60cd7e9d32c3555a3bf7cfd890ddd6.tar.bz2
edk2-006c2647dc60cd7e9d32c3555a3bf7cfd890ddd6.zip
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>
Diffstat (limited to 'BaseTools/Source/C/Include')
-rw-r--r--BaseTools/Source/C/Include/Common/BaseTypes.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h
index 39c5408dd4..e1282b3a89 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.