diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 21:45:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:19:17 +0300 |
| commit | 85b104712b8bd4cf5247d5226260dd1528b7f57a (patch) | |
| tree | e1ed0384304986271a3dd61fb7ef9ef2a73a4ee6 | |
| parent | b7525f1f1d123084b60269f420300afdd405b0d1 (diff) | |
No need to setenv SAL_LOG in the code for iOS
One can set environment variables to be used when debugging an app in
Xcode, which is when it is interesting to see SAL_INFO output anyway.
(This is very different from Android, where one can't set environment
variables "before" an app starts, as apps there aren't separate
programs that would be exec'ed.)
Change-Id: I3971d1b2d1a849deac2722a90271ef2458db1643
| -rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 2 | ||||
| -rw-r--r-- | sal/osl/all/log.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index 193a01fdb9ab..5c791f767ae1 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -133,8 +133,6 @@ extern "C" void lo_initialize(void) { - setenv("SAL_LOG", "+WARN+INFO.vcl.headless+INFO.vcl.coretext+INFO.vcl.ios", 1); - const char *argv[] = { "placeholder-exe", "-env:URE_INTERNAL_LIB_DIR=file:///", diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 6106ac34fe09..a79f131a504a 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -97,10 +97,10 @@ char const * toString(sal_detail_LogLevel level) { #endif -// getenv is not thread safe, so minimize use of result; except on Android and -// iOS, see 60628799633ffde502cb105b98d3f254f93115aa "Notice if SAL_LOG is +// getenv is not thread safe, so minimize use of result; except on Android, +// see 60628799633ffde502cb105b98d3f254f93115aa "Notice if SAL_LOG is // changed while the process is running": -#if defined ANDROID || defined IOS +#if defined ANDROID char const * getEnvironmentVariable() { return std::getenv("SAL_LOG"); |