From a2eb1c00669f1f3c2e4f7ab4a0cd2b3cbda5e11f Mon Sep 17 00:00:00 2001 From: Naios Date: Sat, 27 Aug 2016 11:40:13 +0200 Subject: Core/Common: Correct the linking of localeNames (cherry picked from commit 13e5817417f48374ff460c5ccdc5f149a1ae8791) --- src/common/Common.cpp | 2 +- src/common/Common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/common/Common.cpp b/src/common/Common.cpp index eb4316edd69..4555f00a76c 100644 --- a/src/common/Common.cpp +++ b/src/common/Common.cpp @@ -18,7 +18,7 @@ #include "Common.h" -TC_COMMON_API char const* localeNames[TOTAL_LOCALES] = +char const* localeNames[TOTAL_LOCALES] = { "enUS", "koKR", diff --git a/src/common/Common.h b/src/common/Common.h index 3a84f4b2eb5..c4180396a28 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -136,7 +136,7 @@ const uint8 OLD_TOTAL_LOCALES = 9; /// @todo convert in simple system #define MAX_LOCALES 11 -extern "C" TC_COMMON_API char const* localeNames[TOTAL_LOCALES]; +TC_COMMON_API extern char const* localeNames[TOTAL_LOCALES]; TC_COMMON_API LocaleConstant GetLocaleByName(const std::string& name); -- cgit v1.2.3