diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-14 16:49:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-14 17:33:11 +0200 |
| commit | b7998b6f663eb13ccdfaa7473dd1e9b9288771cd (patch) | |
| tree | c0d508121279ce1cadf9c010446b46c872fcad22 /sal | |
| parent | 188696a20a4bd480db79135551a4307e63f745a5 (diff) | |
No need to bark about G_SLICE on stderr.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/alloc_global.c | 17 |
1 files changed, 2 insertions, 15 deletions
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); } /* ================================================================= * |