diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:13:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:13:56 +0000 |
| commit | d93f3c469f88a95fe5401a318f192dec22227f6c (patch) | |
| tree | c377712a919e3817c4cc006ac8a5498db4ce6391 /extensions | |
| parent | 5bd0716377566119da0d3c2d08c189751b4943a8 (diff) | |
INTEGRATION: CWS macosx10 (1.8.460); FILE MERGED
2005/07/19 22:06:08 ericb 1.8.460.1: #i48285# scanner now works on Mac OSX (using SANE)
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 4d7fd29284e3..8848adae1885 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sane.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2003-04-17 15:14:24 $ + * last change: $Author: rt $ $Date: 2005-08-18 08:13:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,7 @@ #include <unistd.h> #include <sys/time.h> #include <sys/types.h> +#include <sal/config.h> #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL #include <stdarg.h> @@ -213,12 +214,12 @@ Sane::~Sane() void Sane::Init() { - pSaneLib = dlopen( "libsane.so", RTLD_LAZY ); + pSaneLib = dlopen( "libsane" SAL_DLLEXTENSION, RTLD_LAZY ); if( ! pSaneLib ) - pSaneLib = dlopen( "libsane.so.1", RTLD_LAZY ); + pSaneLib = dlopen( "libsane" SAL_DLLEXTENSION ".1", RTLD_LAZY ); // try reasonable places that might not be in the library search path if( ! pSaneLib ) - pSaneLib = dlopen( "/usr/local/lib/libsane.so", RTLD_LAZY ); + pSaneLib = dlopen( "/usr/local/lib/libsane" SAL_DLLEXTENSION, RTLD_LAZY ); if( pSaneLib ) { bSaneSymbolLoadFailed = FALSE; @@ -268,7 +269,7 @@ void Sane::Init() } #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL else - fprintf( stderr, "libsane.so could not be opened: %s\n", + fprintf( stderr, "libsane%s could not be opened: %s\n", SAL_DLLEXTENSION, dlerror() ); #endif } |