diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 5c2c75a74eb3..3009bf4a4836 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -2,9 +2,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2000-10-24 12:48:36 $ + * last change: $Author: obo $ $Date: 2000-10-26 13:11:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,10 +78,12 @@ #ifdef WIN #define ODBC_LIBRARY "ODBC.DLL" #define ODBC_UI_LIBRARY "ODBCINST.DLL" -#elif defined WNT +#if defined WNT #define ODBC_LIBRARY "ODBC32.DLL" #define ODBC_UI_LIBRARY "ODBCCP32.DLL" -#elif +#endif +#endif +#ifdef UNX #define ODBC_LIBRARY "libodbc.so" #define ODBC_UI_LIBRARY "libodbc.so" #endif @@ -110,11 +112,11 @@ typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEG typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr); -#define NSQLManageDataSource(a) (*static_cast<TSQLManageDataSource>(m_pSQLManageDataSource))(a) -#define NSQLAllocHandle(a,b,c) (*static_cast<TSQLAllocHandle>(m_pAllocHandle))(a,b,c) -#define NSQLFreeHandle(a,b) (*static_cast<TSQLFreeHandle>(m_pFreeHandle))(a,b) -#define NSQLSetEnvAttr(a,b,c,d) (*static_cast<TSQLSetEnvAttr>(m_pSetEnvAttr))(a,b,c,d) -#define NSQLDataSources(a,b,c,d,e,f,g,h) (*static_cast<TSQLDataSources>(m_pDataSources))(a,b,c,d,e,f,g,h) +#define NSQLManageDataSource(a) (*reinterpret_cast<TSQLManageDataSource>(m_pSQLManageDataSource))(a) +#define NSQLAllocHandle(a,b,c) (*reinterpret_cast<TSQLAllocHandle>(m_pAllocHandle))(a,b,c) +#define NSQLFreeHandle(a,b) (*reinterpret_cast<TSQLFreeHandle>(m_pFreeHandle))(a,b) +#define NSQLSetEnvAttr(a,b,c,d) (*reinterpret_cast<TSQLSetEnvAttr>(m_pSetEnvAttr))(a,b,c,d) +#define NSQLDataSources(a,b,c,d,e,f,g,h) (*reinterpret_cast<TSQLDataSources>(m_pDataSources))(a,b,c,d,e,f,g,h) #endif //========================================================================= @@ -327,6 +329,9 @@ void OOdbcManagement::manageDataSources(void* _pParentSysWindowHandle) /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.1 2000/10/24 12:48:36 fs + * initial checkin - wrapping (system) data source related ODBC functionality + * * * Revision 1.0 24.10.00 10:14:13 fs ************************************************************************/ |