Merge pull request #8165 from lioncash/linkage

{Android/ButtonManager, ResourcePack/Manager}: Make file-scope variables/functions internally linked where applicable
This commit is contained in:
Connor McLaughlin
2019-06-08 20:56:13 +10:00
committed by GitHub
2 changed files with 19 additions and 14 deletions

View File

@ -11,15 +11,13 @@
#include <algorithm>
namespace
{
std::vector<ResourcePack::ResourcePack> packs;
std::string packs_path;
} // namespace
namespace ResourcePack
{
namespace
{
std::vector<ResourcePack> packs;
std::string packs_path;
IniFile GetPackConfig()
{
packs_path = File::GetUserPath(D_RESOURCEPACK_IDX) + "/Packs.ini";
@ -29,6 +27,7 @@ IniFile GetPackConfig()
return file;
}
} // Anonymous namespace
bool Init()
{