diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-01 20:39:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-02 08:19:49 +0200 |
| commit | e3c0b6e6eecdcd94b37d8bb126668ec0db52d487 (patch) | |
| tree | 96f613e68cb0bef1e785bc8722d0b1ef19df9850 /desktop | |
| parent | df6270e9c1d75a4865bf79043190669b74de71d3 (diff) | |
Revert rtl_alloc_preInit back to boolean argument
This effectively reverts 271a663d2f098f3f665cab6da2e13b265a7eab93 "rtl: support
start/stop threads around pre-init" again, now that
df6ba650469a6f2fda06ef1c2e107ccdd3570505 "Remove 'officially dead now' rtl_cache
slab allocator mechanism" removed the wsupdate thread.
(rtl_alloc_preInit is an internal-use-only C function, so changing its arguments
doesn't affect URE compatibility.)
Change-Id: Ie9bce86377f9520e2600e4111ac525dddace10f8
Reviewed-on: https://gerrit.libreoffice.org/58443
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 04f586ce4eb3..3af3b54d015f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3815,9 +3815,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char return 1; if (eStage == PRE_INIT) - rtl_alloc_preInit(rtlAllocPreInitStart); + rtl_alloc_preInit(true); else if (eStage == SECOND_INIT) - rtl_alloc_preInit(rtlAllocPreInitEnd); + rtl_alloc_preInit(false); if (eStage != SECOND_INIT) comphelper::LibreOfficeKit::setActive(); |