From 069497e87da5759a971c71584b23c005d98d97eb Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 7 Jun 2019 20:02:00 -0400
Subject: [PATCH] Android/ButtonManager: Make local file-scope variables
 internally linked where applicable

Silences a few -Wmissing-variable-declarations warnings.
---
 Source/Android/jni/ButtonManager.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp
index fafc2ebe4d..554cc6f0e2 100644
--- a/Source/Android/jni/ButtonManager.cpp
+++ b/Source/Android/jni/ButtonManager.cpp
@@ -14,9 +14,10 @@
 
 namespace ButtonManager
 {
+namespace
+{
 const std::string touchScreenKey = "Touchscreen";
-std::unordered_map<std::string, InputDevice*> m_controllers;
-std::vector<std::string> configStrings = {
+const std::vector<std::string> configStrings = {
     // GC
     "InputA",
     "InputB",
@@ -169,7 +170,8 @@ std::vector<std::string> configStrings = {
     // Rumble
     "Rumble",
 };
-std::vector<ButtonType> configTypes = {
+
+const std::vector<ButtonType> configTypes = {
     // GC
     BUTTON_A,
     BUTTON_B,
@@ -323,7 +325,9 @@ std::vector<ButtonType> configTypes = {
     RUMBLE,
 };
 
-static void AddBind(const std::string& dev, sBind* bind)
+std::unordered_map<std::string, InputDevice*> m_controllers;
+
+void AddBind(const std::string& dev, sBind* bind)
 {
   auto it = m_controllers.find(dev);
   if (it != m_controllers.end())
@@ -334,6 +338,7 @@ static void AddBind(const std::string& dev, sBind* bind)
   m_controllers[dev] = new InputDevice(dev);
   m_controllers[dev]->AddBind(bind);
 }
+}  // Anonymous namespace
 
 void Init(const std::string& gameId)
 {