From 3168361e32ea051828d9025049b0358771e5ff8a Mon Sep 17 00:00:00 2001
From: Rohit Nirmal <rohitnirmal9@gmail.com>
Date: Mon, 22 Sep 2014 17:45:42 -0400
Subject: [PATCH] Android: Silence some more warnings.

---
 Source/Core/Common/ArmCPUDetect.cpp             | 10 +++++-----
 Source/Core/Common/MemArena.cpp                 |  2 +-
 Source/Core/DolphinWX/Android/ButtonManager.cpp |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp
index 8e324af868..7935577ebc 100644
--- a/Source/Core/Common/ArmCPUDetect.cpp
+++ b/Source/Core/Common/ArmCPUDetect.cpp
@@ -14,7 +14,7 @@
 #if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
 const char procfile[] = "/proc/cpuinfo";
 
-std::string GetCPUString()
+static std::string GetCPUString()
 {
 	const std::string marker = "Hardware\t: ";
 	std::string cpu_string = "Unknown";
@@ -38,7 +38,7 @@ std::string GetCPUString()
 	return cpu_string;
 }
 
-unsigned char GetCPUImplementer()
+static unsigned char GetCPUImplementer()
 {
 	const std::string marker = "CPU implementer\t: ";
 	unsigned char implementer = 0;
@@ -62,7 +62,7 @@ unsigned char GetCPUImplementer()
 	return implementer;
 }
 
-unsigned short GetCPUPart()
+static unsigned short GetCPUPart()
 {
 	const std::string marker = "CPU part\t: ";
 	unsigned short part = 0;
@@ -86,7 +86,7 @@ unsigned short GetCPUPart()
 	return part;
 }
 
-bool CheckCPUFeature(const std::string& feature)
+static bool CheckCPUFeature(const std::string& feature)
 {
 	const std::string marker = "Features\t: ";
 
@@ -115,7 +115,7 @@ bool CheckCPUFeature(const std::string& feature)
 }
 #endif
 
-int GetCoreCount()
+static int GetCoreCount()
 {
 #ifdef __SYMBIAN32__
 	return 1;
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp
index 5ab87f6a0c..16eecf33d6 100644
--- a/Source/Core/Common/MemArena.cpp
+++ b/Source/Core/Common/MemArena.cpp
@@ -28,7 +28,7 @@
 #ifdef ANDROID
 #define ASHMEM_DEVICE "/dev/ashmem"
 
-int AshmemCreateFileMapping(const char *name, size_t size)
+static int AshmemCreateFileMapping(const char *name, size_t size)
 {
 	int fd, ret;
 	fd = open(ASHMEM_DEVICE, O_RDWR);
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index 8d6d241a36..7b1004415f 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -58,7 +58,7 @@ namespace ButtonManager
 		TRIGGER_R
 	};
 
-	void AddBind(std::string dev, sBind *bind)
+	static void AddBind(std::string dev, sBind *bind)
 	{
 		auto it = m_controllers.find(dev);
 		if (it != m_controllers.end())