diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-07 07:52:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-07 07:59:15 +0300 |
| commit | 97593ae24a98daca89fad176dc2492e582b3a821 (patch) | |
| tree | f52189545a5c5ffbc7cece7bca595b2cd18c9cc0 /cppuhelper | |
| parent | 1691752dd29d661552700d9bcac5d3a3953fb91a (diff) | |
Handle lack of module loading/unloading API when DISABLE_DYNLOADING
There are basicically two classes of cases:
1) Where the code is for obscure historical reasons or what I see as
misguided "optimization" split into a more libraries than necessary,
and these then are loaded at run-time. Instead, just use direct
linking.
2) Where dynamic loading is part of the functionality offered to some
upper (scripting etc) layer, or where some system-specific non-LO
library is loaded dynamically, as it is not necessarily present on
end-user machines. Can't have such in the DISABLE_DYNLOADING case.
Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index b89fc5b1ead7..ed140f00f8a5 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -595,7 +595,9 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( if (! xRet.is()) { +#ifndef DISABLE_DYNLOADING osl_unloadModule( lib ); +#endif #if OSL_DEBUG_LEVEL > 1 out( "### cannot activate factory: " ); out( aExcMsg ); |