Merge pull request #1568 from rohit-n/android-warnings
Android: Silence a few warnings.
This commit is contained in:
commit
19dabee326
|
@ -205,7 +205,7 @@ void CopyFromEmu(void* data, u32 address, size_t size)
|
|||
{
|
||||
if (!ValidCopyRange(address, size))
|
||||
{
|
||||
PanicAlert("Invalid range in CopyFromEmu. %lx bytes from 0x%08x", size, address);
|
||||
PanicAlert("Invalid range in CopyFromEmu. %lx bytes from 0x%08x", (unsigned long)size, address);
|
||||
return;
|
||||
}
|
||||
memcpy(data, GetPointer(address), size);
|
||||
|
@ -215,7 +215,7 @@ void CopyToEmu(u32 address, const void* data, size_t size)
|
|||
{
|
||||
if (!ValidCopyRange(address, size))
|
||||
{
|
||||
PanicAlert("Invalid range in CopyToEmu. %lx bytes to 0x%08x", size, address);
|
||||
PanicAlert("Invalid range in CopyToEmu. %lx bytes to 0x%08x", (unsigned long)size, address);
|
||||
return;
|
||||
}
|
||||
memcpy(GetPointer(address), data, size);
|
||||
|
|
|
@ -86,8 +86,8 @@ void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset,
|
|||
ARMReg rA = gpr.GetReg();
|
||||
ARMReg rB = gpr.GetReg();
|
||||
ARMReg rC = gpr.GetReg();
|
||||
ARMReg RA;
|
||||
ARMReg RB;
|
||||
ARMReg RA = INVALID_REG;
|
||||
ARMReg RB = INVALID_REG;
|
||||
if (dest != -1)
|
||||
RA = gpr.R(dest);
|
||||
if (regOffset != -1)
|
||||
|
|
Loading…
Reference in New Issue