sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Resolve BaseTools C tool build failure

Browse Source 
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>
This commit is contained in:
Liming Gao
2018-02-27 16:56:48 +08:00
parent 78647b9228
commit 006c2647dc
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/C/GenFv/GenFvInternalLib.c
View File

@ -34,10 +34,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Guid/FfsSectionAlignmentPadding.h> #include <Guid/FfsSectionAlignmentPadding.h>
#include "WinNtInclude.h"
#include "GenFvInternalLib.h" #include "GenFvInternalLib.h"
#include "FvLib.h" #include "FvLib.h"
#include "PeCoffLib.h" #include "PeCoffLib.h"
#include "WinNtInclude.h"
#define ARMT_UNCONDITIONAL_JUMP_INSTRUCTION 0xEB000000 #define ARMT_UNCONDITIONAL_JUMP_INSTRUCTION 0xEB000000
#define ARM64_UNCONDITIONAL_JUMP_INSTRUCTION 0x14000000 #define ARM64_UNCONDITIONAL_JUMP_INSTRUCTION 0x14000000

3
BaseTools/Source/C/Include/Common/BaseTypes.h
View File

@ -122,6 +122,8 @@
#endif #endif
#ifndef GUID_DEFINED
#define GUID_DEFINED
/// ///
/// 128 bit buffer containing a unique identifier value. /// 128 bit buffer containing a unique identifier value.
/// Unless otherwise specified, aligned on a 64 bit boundary. /// Unless otherwise specified, aligned on a 64 bit boundary.
@ -132,6 +134,7 @@ typedef struct {
UINT16 Data3; UINT16 Data3;
UINT8 Data4[8]; UINT8 Data4[8];
} GUID; } GUID;
#endif
/// ///
/// 4-byte buffer. An IPv4 internet protocol address. /// 4-byte buffer. An IPv4 internet protocol address.