Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2013-03-04 14:31:01 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-03-04 14:31:01 +0400
commit4cfa28b5edfaba6f2d943f45122a55e9af2f9513 (patch)
tree63bab1de97a3ab852b54826c1cb29e532c545031 /intern/locale
parent4fd223075503610392e368eb2e1afb87578f06df (diff)
OSX/locale: a further cleanup
Diffstat (limited to 'intern/locale')
-rw-r--r--intern/locale/boost_locale_wrapper.cpp1
-rw-r--r--intern/locale/boost_locale_wrapper.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index ef22e31e3cf..81c348e52f1 100644
--- a/intern/locale/boost_locale_wrapper.cpp
+++ b/intern/locale/boost_locale_wrapper.cpp
@@ -66,6 +66,7 @@ void bl_locale_set(const char *locale)
}
else {
#ifdef __APPLE__
+ extern const char *user_locale; // pulled from Ghost_SystemCocoa
std::string locale_osx = user_locale + std::string(".UTF-8");
_locale = gen(locale_osx.c_str());
std::locale::global(_locale);
diff --git a/intern/locale/boost_locale_wrapper.h b/intern/locale/boost_locale_wrapper.h
index 22f3793ae67..ff3645a5983 100644
--- a/intern/locale/boost_locale_wrapper.h
+++ b/intern/locale/boost_locale_wrapper.h
@@ -43,10 +43,6 @@ void bl_locale_set(const char *locale);
const char *bl_locale_get(void);
const char *bl_locale_pgettext(const char *msgctxt, const char *msgid);
-#ifdef __APPLE__
-extern const char *user_locale; // pulled from Ghost_SystemCocoa
-#endif
-
#ifdef __cplusplus
}
#endif