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

Silence a MSVC warning.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2017-01-03 12:34:13 +01:00
parent 3026821f9f
commit 5d3be8da1d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.h
+1
View File
@@ -65,6 +65,7 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) > 0) // -funsigned-char
# pragma warning(error: 4805) # pragma warning(error: 4805)
# pragma warning(disable: 4244) // -Wconversion # pragma warning(disable: 4244) // -Wconversion
# pragma warning(disable: 4267) // -Wconversion # pragma warning(disable: 4267) // -Wconversion
# pragma warning(disable: 4820) // padding added after data member
#endif #endif
// FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc-*.deb packages) // FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc-*.deb packages)
src/p_mach.cpp
+2 -1
View File
@@ -1365,7 +1365,8 @@ void PackMachBase<T>::pack1(OutputFile *const fo, Filter &/*ft*/) // generate e
mhdro = mhdri; mhdro = mhdri;
if (my_filetype==Mach_header::MH_EXECUTE) { if (my_filetype==Mach_header::MH_EXECUTE) {
memcpy(&mhdro, stub_main, sizeof(mhdro)); memcpy(&mhdro, stub_main, sizeof(mhdro));
mhdro.flags &= ~Mach_header::MH_PIE; // we require fixed address COMPILE_TIME_ASSERT(sizeof(mhdro.flags) == sizeof(unsigned))
mhdro.flags &= ~ (unsigned) Mach_header::MH_PIE; // we require fixed address
mhdro.flags |= Mach_header::MH_BINDATLOAD; // DT_BIND_NOW mhdro.flags |= Mach_header::MH_BINDATLOAD; // DT_BIND_NOW
} }
unsigned pos = sizeof(mhdro); unsigned pos = sizeof(mhdro);