From 906396c602f9a4eb4f7db38fdadad7599f80f83e Mon Sep 17 00:00:00 2001
From: The Dax <daxtsu@gmail.com>
Date: Sun, 31 Aug 2014 03:05:59 -0400
Subject: [PATCH] GetWideCmdLine doesn't need to be exposed in the header
 anymore. Also fix a warning.

---
 Common/CommonWindows.h | 2 --
 Windows/EmuThread.cpp  | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Common/CommonWindows.h b/Common/CommonWindows.h
index f028f5d1de..2780a8dfed 100644
--- a/Common/CommonWindows.h
+++ b/Common/CommonWindows.h
@@ -22,8 +22,6 @@ extern "C" void _ReadBarrier();
 
 #else
 #include <Windows.h>
-#include <vector>
-extern std::vector<std::wstring> GetWideCmdLine();
 #endif
 
 #undef min
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index dff7aca8b9..05e76b6efe 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -27,6 +27,8 @@ static recursive_mutex emuThreadLock;
 static HANDLE emuThread;
 static volatile long emuThreadReady;
 
+extern std::vector<std::wstring> GetWideCmdLine();
+
 enum EmuThreadStatus : long
 {
 	THREAD_NONE = 0,
@@ -96,9 +98,9 @@ unsigned int WINAPI TheThread(void *)
 	// -TheDax
 	std::vector<std::wstring> wideArgs = GetWideCmdLine();
 	std::vector<std::string> argsUTF8;
-	for (auto& i : wideArgs)
+	for (auto& string : wideArgs)
 	{
-		argsUTF8.push_back(ConvertWStringToUTF8(i));
+		argsUTF8.push_back(ConvertWStringToUTF8(string));
 	}
 
 	std::vector<const char *> args;
@@ -108,7 +110,7 @@ unsigned int WINAPI TheThread(void *)
 		args.push_back(string.c_str());
 	}
 
-	NativeInit(args.size(), &args[0], "1234", "1234", "1234");
+	NativeInit(static_cast<int>(args.size()), &args[0], "1234", "1234", "1234");
 
 	Host *nativeHost = host;
 	host = oldHost;