diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-06 09:50:52 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-06 09:50:52 +0000 |
| commit | 7c3cc3cabec0c06f6b78efb8c7a88acf9f174dc6 (patch) | |
| tree | 18da712d1e061846513d49fa3c77d1636201f263 /connectivity/source | |
| parent | f3366ee623ca1d6e7e68425fd87dc7e8575ddd28 (diff) | |
INTEGRATION: CWS dba07 (1.4.102); FILE MERGED
2003/05/30 10:29:38 oj 1.4.102.1: #i14940# use odbc.lib.so.1
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/odbc/OFunctions.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index 6367dfb0b1f2..661454668a6d 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OFunctions.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2001-05-15 08:18:13 $ + * last change: $Author: vg $ $Date: 2003-06-06 10:50:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,13 +152,17 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) _rPath = ::rtl::OUString::createFromAscii("ODBC32.DLL"); #endif #ifdef UNX - _rPath = ::rtl::OUString::createFromAscii("libodbc.so"); + _rPath = ::rtl::OUString::createFromAscii("libodbc.so.1"); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); + if ( !pODBCso ) + _rPath = ::rtl::OUString::createFromAscii("libodbc.so"); #endif #ifdef OS2 _rPath = ::rtl::OUString::createFromAscii("ODBC"); #endif - pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); + if ( !pODBCso ) + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) #ifdef OS2 { |