mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Avoid warning C4805: '|': unsafe mix of type 'bool' and type 'unsigned int' in operation

Browse Source 
modified:   p_lx_elf.cpp
	modified:   p_lx_elf.h
This commit is contained in:
John Reiser 2016-12-18 11:32:47 -08:00
parent 9c1bc99d7a
commit a1cabd5a68
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_lx_elf.cpp
View File

@ -516,7 +516,7 @@ void PackLinuxElf64::pack3(OutputFile *fo, Filter &ft)
void void
PackLinuxElf::addStubEntrySections(Filter const *) PackLinuxElf::addStubEntrySections(Filter const *)
{ {
int all_pages = opt->o_unix.unmap_all_pages | is_big; bool all_pages = opt->o_unix.unmap_all_pages | is_big;
addLoader("ELFMAINX", NULL); addLoader("ELFMAINX", NULL);
if (hasLoaderSection("ELFMAINXu")) { if (hasLoaderSection("ELFMAINXu")) {
// brk() trouble if static // brk() trouble if static

2
src/p_lx_elf.h
View File

@ -81,7 +81,7 @@ protected:
unsigned sz_pack2a; // after pack2() of all PT_LOAD unsigned sz_pack2a; // after pack2() of all PT_LOAD
unsigned lg2_page; // log2(PAGE_SIZE) unsigned lg2_page; // log2(PAGE_SIZE)
unsigned page_size; // 1u<<lg2_page unsigned page_size; // 1u<<lg2_page
unsigned is_big; // stub style: must use area above the brk bool is_big; // stub style: must use area above the brk
unsigned xct_off; // shared library: file offset of SHT_EXECINSTR unsigned xct_off; // shared library: file offset of SHT_EXECINSTR
unsigned hatch_off; // file offset of escape hatch unsigned hatch_off; // file offset of escape hatch
upx_uint64_t load_va; // PT_LOAD[0].p_vaddr upx_uint64_t load_va; // PT_LOAD[0].p_vaddr