From 51ac5172f5abebf3440fbfbfd08cb1e4f9d89f85 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sun, 12 Feb 2006 11:20:26 +0000 Subject: [PATCH] #undef PAGE_{MASK,SIZE} to fix build problems on some machines. committer: mfx 1139743226 +0000 --- src/p_lx_elf.cpp | 2 ++ src/p_lx_exc.cpp | 1 + src/p_lx_interp.cpp | 5 +++-- src/p_mach.cpp | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp index 973a0894..49dee2cc 100644 --- a/src/p_lx_elf.cpp +++ b/src/p_lx_elf.cpp @@ -894,6 +894,8 @@ void PackLinuxElf64amd::pack3(OutputFile *fo, Filter &ft) fo->write(&zero, frag); len += frag; +#undef PAGE_MASK +#undef PAGE_SIZE #define PAGE_MASK (~0u<<12) #define PAGE_SIZE (-PAGE_MASK) upx_byte *const p = const_cast(getLoader()); diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp index c412aed1..8aeb8e25 100644 --- a/src/p_lx_exc.cpp +++ b/src/p_lx_exc.cpp @@ -215,6 +215,7 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft) fo->write(shstrtab, sizeof(shstrtab)); #endif // } +#undef PAGE_MASK #define PAGE_MASK (~0u<<12) // pre-calculate for benefit of runtime disappearing act via munmap() elfout.phdr[0].p_memsz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz); diff --git a/src/p_lx_interp.cpp b/src/p_lx_interp.cpp index 1a79dcb2..ae5006eb 100644 --- a/src/p_lx_interp.cpp +++ b/src/p_lx_interp.cpp @@ -129,12 +129,13 @@ void PackLinuxI386interp::pack2(OutputFile *fo, Filter &ft) super::pack2(fo, ft); } +#undef PAGE_MASK #define PAGE_MASK (~0u<<12) void PackLinuxI386interp::pack3(OutputFile *fo, Filter &/*ft*/) { - unsigned long base = getbase(phdri, ehdri.e_phnum); - unsigned long sz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz); + unsigned base = getbase(phdri, ehdri.e_phnum); + unsigned sz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz); if (base < (0x11000 + sz)) { base = 0x11000 + sz; } diff --git a/src/p_mach.cpp b/src/p_mach.cpp index dfb2b616..641151da 100644 --- a/src/p_mach.cpp +++ b/src/p_mach.cpp @@ -231,6 +231,8 @@ PackMachPPC32::pack2(OutputFile *fo, Filter &ft) // append compressed body segcmdo.filesize = fo->getBytesWritten(); } +#undef PAGE_MASK +#undef PAGE_SIZE #define PAGE_MASK (~0u<<12) #define PAGE_SIZE -PAGE_MASK void