Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Final updates for upx 1.92.

Browse Source 
committer: mfx <mfx> 1090281040 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2004-07-19 23:50:40 +00:00
parent 95021e4977
commit 814eabb88e
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.h
+4 -4
View File
@@ -88,10 +88,10 @@
# pragma warning(disable: 4514) // W4: 'function': unreferenced inline function has been removed
# pragma warning(disable: 4710) // W4: 'function': function not inlined
# if (_MSC_VER >= 1300)
# pragma warning(disable: 4625) // W4:
# pragma warning(disable: 4626) // W4:
# pragma warning(disable: 4711) // W4:
# pragma warning(disable: 4820) // W4:
# pragma warning(disable: 4625) // W4: 'class' : copy constructor could not be generated because a base class copy constructor is inaccessible
# pragma warning(disable: 4626) // W4: 'class' : assignment operator could not be generated because a base class assignment operator is inaccessible
# pragma warning(disable: 4711) // W4: 'function' selected for automatic inline expansion
# pragma warning(disable: 4820) // W4: 'struct' : 'x' bytes padding added after member 'member'
# endif
# if (_MSC_VER >= 1400)
# pragma warning(disable: 4996) // W1: 'function': was declared deprecated
src/p_vmlinx.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ const int *PackVmlinuxI386::getFilters() const
}
static int __acc_cdecl_qsort
compare_Phdr(void const *const aa, void const *const bb)
compare_Phdr(void const *aa, void const *bb)
{
Elf_LE32_Phdr const *const a = (Elf_LE32_Phdr const *)aa;
Elf_LE32_Phdr const *const b = (Elf_LE32_Phdr const *)bb;
@@ -140,7 +140,7 @@ bool PackVmlinuxI386::canPack()
return false;
}
if (0 < j) {
unsigned const sz = -phdri[j-1].p_align
unsigned const sz = (0u - phdri[j-1].p_align)
& (phdri[j-1].p_align -1 + phdri[j-1].p_filesz);
if ((sz + phdri[j-1].p_offset)!=phdri[j].p_offset) {
return false;