From 4cfa28b5edfaba6f2d943f45122a55e9af2f9513 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Mon, 4 Mar 2013 10:31:01 +0000 Subject: OSX/locale: a further cleanup --- intern/locale/boost_locale_wrapper.cpp | 1 + intern/locale/boost_locale_wrapper.h | 4 ---- 2 files changed, 1 insertion(+), 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 -- cgit v1.2.3