diff options
| author | flacs <tilkax@gmail.com> | 2015-09-11 14:08:58 +0000 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-09-11 14:08:58 +0000 |
| commit | c07d672b31f119e17dabe68856e66ec62e87583c (patch) | |
| tree | 824183d94473f38a8c0f73cdf6b65776c4cbe20a /Source/Core/VideoCommon/Fifo.cpp | |
| parent | c319fbb98d8d53a601800a8082ec6a56425fc993 (diff) | |
| parent | 19459e827f6c15f9429598015019ecb66f2e6cad (diff) | |
Merge pull request #3003 from dolphin-emu/revert-2961-printf
Partially revert "General: Toss out PRI macro usage"
Diffstat (limited to 'Source/Core/VideoCommon/Fifo.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Fifo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index a788d61ce7..2395d2b324 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -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; } } |