diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index 6307335e8..8f36d3d46 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -15,7 +15,9 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#if defined(_MSC_VER) #pragma warning(disable:4091) // workaround bug in VS2015 headers +#endif #include "FileUtil.h" #include "StringUtils.h" diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp index 82fa94741..4f9b497c0 100644 --- a/Core/HLE/sceKernelMbx.cpp +++ b/Core/HLE/sceKernelMbx.cpp @@ -423,7 +423,7 @@ int sceKernelSendMbx(SceUID id, u32 packetAddr) NativeMbxPacket p; for (int i = 0, n = m->nmb.numMessages; i < n; i++) { - Memory::ReadStruct(next, &p); + Memory::ReadStructUnchecked(next, &p); if (addPacket->priority < p.priority) { if (i == 0) diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp index 872d0504c..abf7ca70b 100644 --- a/Core/HLE/sceMpeg.cpp +++ b/Core/HLE/sceMpeg.cpp @@ -932,7 +932,7 @@ static bool decodePmpVideo(PSPPointer ringbuffer, u32 pmpctxA // joint all blocks into H264Frames SceMpegLLI lli; for (int i = 0; i < pmp_nBlocks; i++){ - Memory::ReadStruct(pmp_videoSource, &lli); + Memory::ReadStructUnchecked(pmp_videoSource, &lli); // add source block into pmpframes pmpframes->add(Memory::GetPointer(lli.pSrc), lli.iSize); // get next block