From 8fdb013d540cf5d79a23888053fda2897f997e61 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 4 Sep 2015 19:44:39 -0400
Subject: General: Toss out PRI macro usage

Now that VS supports more printf specifiers, these aren't necessary
---
 Source/Core/Common/JitRegister.cpp | 2 +-
 Source/Core/Common/SDCardUtil.cpp  | 2 +-
 Source/Core/Common/SysConf.cpp     | 2 +-
 Source/Core/Common/Timer.cpp       | 2 +-
 Source/Core/Common/x64Emitter.cpp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Source/Core/Common')

diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
index 33dbcb52f9..26d760707a 100644
--- a/Source/Core/Common/JitRegister.cpp
+++ b/Source/Core/Common/JitRegister.cpp
@@ -96,7 +96,7 @@ void RegisterV(const void* base_address, u32 code_size,
 	if (s_perf_map_file.IsOpen())
 	{
 		std::string entry = StringFromFormat(
-			"%" PRIx64 " %x %s\n",
+			"%llx %x %s\n",
 			(u64)base_address, code_size, symbol_name.data());
 		s_perf_map_file.WriteBytes(entry.data(), entry.size());
 	}
diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp
index fe49202a59..a40b90bc75 100644
--- a/Source/Core/Common/SDCardUtil.cpp
+++ b/Source/Core/Common/SDCardUtil.cpp
@@ -203,7 +203,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename)
 
 	if (disk_size < 0x800000 || disk_size > 0x800000000ULL)
 	{
-		ERROR_LOG(COMMON, "Trying to create SD Card image of size %" PRIu64 "MB is out of range (8MB-32GB)", disk_size/(1024*1024));
+		ERROR_LOG(COMMON, "Trying to create SD Card image of size %lluMB is out of range (8MB-32GB)", disk_size/(1024*1024));
 		return false;
 	}
 
diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp
index 047114774a..2c6896c001 100644
--- a/Source/Core/Common/SysConf.cpp
+++ b/Source/Core/Common/SysConf.cpp
@@ -53,7 +53,7 @@ bool SysConf::LoadFromFile(const std::string& filename)
 	u64 size = File::GetSize(filename);
 	if (size != SYSCONF_SIZE)
 	{
-		if (AskYesNoT("Your SYSCONF file is the wrong size.\nIt should be 0x%04x (but is 0x%04" PRIx64 ")\nDo you want to generate a new one?",
+		if (AskYesNoT("Your SYSCONF file is the wrong size.\nIt should be 0x%04x (but is 0x%04llx)\nDo you want to generate a new one?",
 					SYSCONF_SIZE, size))
 		{
 			GenerateSysConf();
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
index 451e6a0725..079e4db544 100644
--- a/Source/Core/Common/Timer.cpp
+++ b/Source/Core/Common/Timer.cpp
@@ -147,7 +147,7 @@ std::string Timer::GetTimeElapsedFormatted() const
 	// Hours
 	u32 Hours = Minutes / 60;
 
-	std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03" PRIu64,
+	std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03llu",
 		Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000);
 	return TmpStr;
 }
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
index f2763d83a8..304316ef12 100644
--- a/Source/Core/Common/x64Emitter.cpp
+++ b/Source/Core/Common/x64Emitter.cpp
@@ -236,7 +236,7 @@ void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
 		             (distance < 0x80000000LL &&
 		              distance >=  -0x80000000LL) ||
 		             !warn_64bit_offset,
-		             "WriteRest: op out of range (0x%" PRIx64 " uses 0x%" PRIx64 ")",
+		             "WriteRest: op out of range (0x%llx uses 0x%llx)",
 		             ripAddr, offset);
 		s32 offs = (s32)distance;
 		emit->Write32((u32)offs);
-- 
cgit v1.2.3