diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 19f3960454..ace88f8072 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + #include "Common/ChunkFile.h" #include "Common/Common.h" #include "Common/Thread.h" @@ -687,7 +689,7 @@ void ExecuteCommand() if (iDVDOffset + m_DILENGTH.Length - g_last_read_offset > 1024 * 1024) { // No buffer; just use the simple seek time + read time. - DEBUG_LOG(DVDINTERFACE, "Seeking %lld bytes", s64(g_last_read_offset) - s64(iDVDOffset)); + DEBUG_LOG(DVDINTERFACE, "Seeking %" PRId64 " bytes", s64(g_last_read_offset) - s64(iDVDOffset)); ticksUntilTC = disk_read_duration; g_last_read_time = cur_time + ticksUntilTC; } @@ -707,19 +709,19 @@ void ExecuteCommand() if (cur_time > buffer_fill_time) { - DEBUG_LOG(DVDINTERFACE, "Fast buffer read at %lld", s64(iDVDOffset)); + DEBUG_LOG(DVDINTERFACE, "Fast buffer read at %" PRId64, s64(iDVDOffset)); ticksUntilTC = buffer_read_duration; g_last_read_time = buffer_fill_time; } else if (cur_time + disk_read_duration > buffer_fill_time) { - DEBUG_LOG(DVDINTERFACE, "Slow buffer read at %lld", s64(iDVDOffset)); + DEBUG_LOG(DVDINTERFACE, "Slow buffer read at %" PRId64, s64(iDVDOffset)); ticksUntilTC = std::max(buffer_fill_time - cur_time, buffer_read_duration); g_last_read_time = buffer_fill_time; } else { - DEBUG_LOG(DVDINTERFACE, "Short seek %lld bytes", s64(g_last_read_offset) - s64(iDVDOffset)); + DEBUG_LOG(DVDINTERFACE, "Short seek %" PRId64 " bytes", s64(g_last_read_offset) - s64(iDVDOffset)); ticksUntilTC = disk_read_duration; g_last_read_time = cur_time + ticksUntilTC; } diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index b5cd8833a6..398ec639ac 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -10,7 +10,6 @@ static const u64 GC_ALIGNED16(psSignBits2[2]) = {0x8000000000000000ULL, 0x8000000000000000ULL}; static const u64 GC_ALIGNED16(psAbsMask2[2]) = {0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL}; -static const double one_const = 1.0f; void Jit64::fp_tri_op(int d, int a, int b, bool reversible, bool single, void (XEmitter::*op)(Gen::X64Reg, Gen::OpArg)) { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp index cd71dbbd9e..88ecdbf7a9 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp @@ -16,7 +16,6 @@ static const u64 GC_ALIGNED16(psSignBits[2]) = {0x8000000000000000ULL, 0x8000000000000000ULL}; static const u64 GC_ALIGNED16(psAbsMask[2]) = {0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL}; -static const double GC_ALIGNED16(psOneOne[2]) = {1.0, 1.0}; void Jit64::ps_mr(UGeckoInstruction inst) { diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index b6c0935a83..af7e8bbe40 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -104,7 +104,7 @@ PC_TexFormat GetHiresTex(const std::string& filename, unsigned int* pWidth, unsi *pWidth = width; *pHeight = height; - int offset = 0; + //int offset = 0; PC_TexFormat returnTex = PC_TEX_FMT_NONE; switch (texformat)