summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-11-10 01:16:22 +0200
committerTor Lillqvist <tml@collabora.com>2018-11-12 22:44:11 +0200
commit54e6c774a19972a97b716d86783bdd2c3b10498b (patch)
treef81eea8c58999b90d05fdeac1370637df0c72885 /sal
parentb0175cf3b698122dc3c8ef19d4336949c1c3529f (diff)
Don't bother setting LC_ALL, LC_CTYPE, and LANG on iOS
An iOS app might itself, for testing and debugging purposes, look for LANG in the environment (passed to by the developer in Xcode; the OS does not set such an environment variable). It is confusing if that then gets (re-)set during the execution of core code. (cherry picked from commit f1801432abaaa6c6137d62319d855b6a3599e182) Change-Id: I9dcf44090aed84b55fd4240bda2562026cd8dacb
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/nlsupport.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 5300752335af..8b520f85f60a 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -834,9 +834,11 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
/* return the locale */
*ppLocale = parse_locale( locale.getStr() );
+#ifndef IOS
setenv( "LC_ALL", locale.getStr(), 1);
setenv("LC_CTYPE", locale.getStr(), 1 );
setenv("LANG", locale.getStr(), 1 );
+#endif
}
#else
/*****************************************************************************