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

BaseTools: Update BaseTools to pass VS2015 compiler

Browse Source 
Fix some errors to pass VS2015 compiler.
1. warning C4456: declaration of xxx hides previous local declaration
2. warning C4005: 'UINT8_MAX': macro redefinition

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19768 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Yonghong Zhu
2016-01-29 04:54:37 +00:00
committed by yzhu52
parent e459de7800
commit 5aec6991e7
5 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BaseTools/Source/C/GenVtf/GenVtf.c
View File

@@ -2,7 +2,7 @@
This file contains functions required to generate a boot strap file (BSF) also
known as the Volume Top File (VTF)
Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
@@ -2652,20 +2652,20 @@ Returns:
SymFileName = VTF_SYM_FILE;
} else {
INTN OutFileNameLen = strlen(OutFileName1);
INTN Index;
INTN NewIndex;
for (Index = OutFileNameLen; Index > 0; --Index) {
if (OutFileName1[Index] == '/' || OutFileName1[Index] == '\\') {
for (NewIndex = OutFileNameLen; NewIndex > 0; --NewIndex) {
if (OutFileName1[NewIndex] == '/' || OutFileName1[NewIndex] == '\\') {
break;
}
}
if (Index == 0) {
if (NewIndex == 0) {
SymFileName = VTF_SYM_FILE;
} else {
INTN SymFileNameLen = Index + 1 + strlen(VTF_SYM_FILE);
INTN SymFileNameLen = NewIndex + 1 + strlen(VTF_SYM_FILE);
SymFileName = malloc(SymFileNameLen + 1);
memcpy(SymFileName, OutFileName1, Index + 1);
memcpy(SymFileName + Index + 1, VTF_SYM_FILE, strlen(VTF_SYM_FILE));
memcpy(SymFileName, OutFileName1, NewIndex + 1);
memcpy(SymFileName + NewIndex + 1, VTF_SYM_FILE, strlen(VTF_SYM_FILE));
SymFileName[SymFileNameLen] = '\0';
}
if (DebugMode) {