diff options
| -rwxr-xr-x | desktop/unx/source/start.c | 7 | ||||
| -rw-r--r-- | sal/rtl/source/alloc_global.c | 17 |
2 files changed, 3 insertions, 21 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 3ad641c46e5b..e2a3b2aacccb 100755 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -818,7 +818,6 @@ exec_javaldx (Args *args) rtl_uString *pApp; rtl_uString **ppArgs; rtl_uString *pTmp, *pTmp2; - rtl_uString *pEnvironment[1] = { NULL }; ppArgs = (rtl_uString **)calloc( args->nArgsEnv + 2, sizeof( rtl_uString* ) ); @@ -849,20 +848,16 @@ exec_javaldx (Args *args) rtl_uString_newConcat( &pApp, pApp, pTmp ); rtl_uString_release( pTmp ); - /* unset to avoid bogus console output */ - rtl_uString_newFromAscii( &pEnvironment[0], "G_SLICE" ); - err = osl_executeProcess_WithRedirectedIO( pApp, ppArgs, nArgs, osl_Process_NORMAL, NULL, // security NULL, // work dir - pEnvironment, 1, + NULL, 0, &javaldx, // process handle NULL, &fileOut, NULL); - rtl_uString_release( pEnvironment[0] ); rtl_uString_release( ppArgs[nArgs-1] ); rtl_uString_release( pApp ); free( ppArgs ); diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c index e93c666f596e..57728f61ffb4 100644 --- a/sal/rtl/source/alloc_global.c +++ b/sal/rtl/source/alloc_global.c @@ -39,21 +39,8 @@ AllocMode alloc_mode = AMode_UNSET; #if !defined(FORCE_SYSALLOC) static void determine_alloc_mode(void) { - /* This shouldn't happen, but still ... */ - if (alloc_mode != AMode_UNSET) - return; - - if (getenv("G_SLICE") != NULL) - { - alloc_mode = AMode_SYSTEM; - fprintf(stderr, "LibreOffice: Using system memory allocator.\n"); - fprintf(stderr, "LibreOffice: This is for debugging only. To disable,\n"); - fprintf(stderr, "LibreOffice: unset the environment variable G_SLICE.\n"); - } - else - { - alloc_mode = AMode_CUSTOM; - } + OSL_ASSERT(alloc_mode == AMode_UNSET); + alloc_mode = (getenv("G_SLICE") == NULL ? AMode_CUSTOM : AMode_SYSTEM); } /* ================================================================= * |