diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:30:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:30:19 +0000 |
| commit | 3b334a3c71e05ce4f998fbbff17e3a82db90fa81 (patch) | |
| tree | b0d46ba01c1d6fd156f97af3c280f67be4eea06d /connectivity | |
| parent | ccae85083b1b1542c1992c6dc8152a4089eb658a (diff) | |
INTEGRATION: CWS ooo11rc2 (1.5.10); FILE MERGED
2003/07/14 16:04:47 fa 1.5.10.1: Support ODBC libraries on Mac OS X.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16726
Dan
fa@ooo
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OFunctions.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index 661454668a6d..245aef9f6c1f 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.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-06-06 10:50:52 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:30:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,10 +152,14 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) _rPath = ::rtl::OUString::createFromAscii("ODBC32.DLL"); #endif #ifdef UNX + #ifdef MACOSX + _rPath = ::rtl::OUString::createFromAscii("libiodbc.dylib"); + #else _rPath = ::rtl::OUString::createFromAscii("libodbc.so.1"); pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if ( !pODBCso ) _rPath = ::rtl::OUString::createFromAscii("libodbc.so"); + #endif /* MACOSX */ #endif #ifdef OS2 _rPath = ::rtl::OUString::createFromAscii("ODBC"); |