diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-01-29 04:54:37 +0000 |
|---|---|---|
| committer | yzhu52 <yzhu52@Edk2> | 2016-01-29 04:54:37 +0000 |
| commit | 5aec6991e7d6af8420eefa4c0fd3bf4de323def2 (patch) | |
| tree | c56e65d769aecc3f402b85f58a2ab0b19f80be7e /BaseTools/Source/C/GenFw | |
| parent | e459de78001be89d37cc286d0fcd57f92e1a438a (diff) | |
| download | edk2-5aec6991e7d6af8420eefa4c0fd3bf4de323def2.tar.gz edk2-5aec6991e7d6af8420eefa4c0fd3bf4de323def2.tar.bz2 edk2-5aec6991e7d6af8420eefa4c0fd3bf4de323def2.zip | |
BaseTools: Update BaseTools to pass VS2015 compiler
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
Diffstat (limited to 'BaseTools/Source/C/GenFw')
| -rw-r--r-- | BaseTools/Source/C/GenFw/Elf32Convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c index eede645769..9bf58555c0 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -1,7 +1,7 @@ /** @file
Elf32 Convert solution
-Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
@@ -815,7 +815,7 @@ WriteRelocations32 ( FoundRelocations = TRUE;
for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx += RelShdr->sh_entsize) {
- Elf_Rel *Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelIdx);
+ Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelIdx);
if (mEhdr->e_machine == EM_386) {
switch (ELF_R_TYPE(Rel->r_info)) {
|