piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert "General: Toss out PRI macro usage"

Browse Source
This commit is contained in:
Lioncash
2015-09-08 01:44:37 -04:00
parent 3014feedc8
commit 19459e827f
36 changed files with 63 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/Fifo.cpp
View File

@ -217,7 +217,7 @@ static void ReadDataFromFifo(u32 readPtr)
size_t existing_len = s_video_buffer_write_ptr - s_video_buffer_read_ptr;
if (len > (size_t)(FIFO_SIZE - existing_len))
{
PanicAlert("FIFO out of bounds (existing %lu + new %lu > %lu)", (unsigned long) existing_len, (unsigned long) len, (unsigned long) FIFO_SIZE);
PanicAlert("FIFO out of bounds (existing %zu + new %zu > %lu)", existing_len, len, (unsigned long) FIFO_SIZE);
return;
}
memmove(s_video_buffer, s_video_buffer_read_ptr, existing_len);
@ -254,7 +254,7 @@ static void ReadDataFromFifoOnCPU(u32 readPtr)
size_t existing_len = write_ptr - s_video_buffer_pp_read_ptr;
if (len > (size_t)(FIFO_SIZE - existing_len))
{
PanicAlert("FIFO out of bounds (existing %lu + new %lu > %lu)", (unsigned long) existing_len, (unsigned long) len, (unsigned long) FIFO_SIZE);
PanicAlert("FIFO out of bounds (existing %zu + new %zu > %lu)", existing_len, len, (unsigned long) FIFO_SIZE);
return;
}
}