diff options
| author | Liming Gao <liming.gao@intel.com> | 2018-02-27 16:56:48 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-02-27 18:34:03 +0800 |
| commit | 006c2647dc60cd7e9d32c3555a3bf7cfd890ddd6 (patch) | |
| tree | 56313206d53d4cecd667f5062cff61e706febd37 | |
| parent | 78647b92287f4a2d7f7ade3fa68f19c345718f02 (diff) | |
| download | edk2-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>
| -rw-r--r-- | BaseTools/Source/C/GenFv/GenFvInternalLib.c | 2 | ||||
| -rw-r--r-- | BaseTools/Source/C/Include/Common/BaseTypes.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 75cbd3ac17..6a34b6f553 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 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.
|