diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-12-10 14:08:15 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-12-10 15:46:54 +0100 |
commit | ecd8f448327fbdfcef86e8706ee8b74e3b886dce (patch) | |
tree | 66ad074eb3afa8a20a8e53e12dcd7ec1caf87014 /extensions/source/scanner/sane.cxx | |
parent | a25a573d5714ab196bbcdbd3a8dcb6d6d7814882 (diff) |
ofz#42182 oss-build failure
possibly since:
commit db3a61cd958f4a70417929cf8e1fa9bfd0bfe5a3
Author: Stephan Bergmann <sbergman@redhat.com>
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 <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/source/scanner/sane.cxx')
-rw-r--r-- | extensions/source/scanner/sane.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; |