From 5d3be8da1dcc37ea673eed7cdc481cd52d95b003 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 3 Jan 2017 12:34:13 +0100 Subject: [PATCH] Silence a MSVC warning. --- src/conf.h | 1 + src/p_mach.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf.h b/src/conf.h index e550665b..ec79b486 100644 --- a/src/conf.h +++ b/src/conf.h @@ -65,6 +65,7 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) > 0) // -funsigned-char # pragma warning(error: 4805) # pragma warning(disable: 4244) // -Wconversion # pragma warning(disable: 4267) // -Wconversion +# pragma warning(disable: 4820) // padding added after data member #endif // FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc-*.deb packages) diff --git a/src/p_mach.cpp b/src/p_mach.cpp index 9d688312..a8aad0f5 100644 --- a/src/p_mach.cpp +++ b/src/p_mach.cpp @@ -1365,7 +1365,8 @@ void PackMachBase::pack1(OutputFile *const fo, Filter &/*ft*/) // generate e mhdro = mhdri; if (my_filetype==Mach_header::MH_EXECUTE) { 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 } unsigned pos = sizeof(mhdro);