extensions/source/scanner/sane.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit ecd8f448327fbdfcef86e8706ee8b74e3b886dce Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 10 14:08:15 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 10 15:46:54 2021 +0100 ofz#42182 oss-build failure possibly since: commit db3a61cd958f4a70417929cf8e1fa9bfd0bfe5a3 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 9 10:15:05 2021 +0100 Generally determine Rdb content from gb_*_set_componentfile calls (?) Change-Id: I947b0dff174ef437750889fb6cc84c8dfa54e7f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126638 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 839602458e6e..20bce0be68d0 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -170,6 +170,7 @@ Sane::~Sane() void Sane::Init() { OUString sSaneLibName( "libsane" SAL_DLLEXTENSION ); +#ifndef DISABLE_DYNLOADING pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); if( ! pSaneLib ) { @@ -183,7 +184,7 @@ void Sane::Init() osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } - +#endif if( pSaneLib ) { bSaneSymbolLoadFailed = false;
