From ec424ec51e9d3b600ab35a5f9423048b334c6958 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 7 Jan 2006 06:02:47 +0000 Subject: [PATCH] fix conflicting globals during link --- stepmania/src/LocalizedString.cpp | 2 +- stepmania/src/LuaReference.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/LocalizedString.cpp b/stepmania/src/LocalizedString.cpp index 1e322a4220..de617f59dd 100644 --- a/stepmania/src/LocalizedString.cpp +++ b/stepmania/src/LocalizedString.cpp @@ -16,7 +16,7 @@ void LocalizedString::RegisterLocalizer( RString (*pfnLocalizer)(const RString&, } #include "SubscriptionManager.h" -SubscriptionManager g_Subscribers; +static SubscriptionManager g_Subscribers; void LocalizedString::RefreshLocalizedStrings() { diff --git a/stepmania/src/LuaReference.cpp b/stepmania/src/LuaReference.cpp index 47c3b2db01..9bc2a28412 100644 --- a/stepmania/src/LuaReference.cpp +++ b/stepmania/src/LuaReference.cpp @@ -9,7 +9,7 @@ REGISTER_CLASS_TRAITS( LuaReference, new LuaReference(*pCopy) ) -SubscriptionManager g_Subscribers; +static SubscriptionManager g_Subscribers; LuaReference::LuaReference() {