diff options
| author | Ocke Janssen <oj@openoffice.org> | 2001-01-10 11:09:37 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2001-01-10 11:09:37 +0000 |
| commit | eabf00133a0783b25302b5f948ddab3e309dc8d7 (patch) | |
| tree | f5af9860893ea74a670b250d886c1ddfc1add713 /dbaccess | |
| parent | 5381e6122575f92c6a1f16a1b3ee9a03b367f7b9 (diff) | |
#82620# calling convention of windows changed
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 56272c797..c4b966318 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.4 $ + * $Revision: 1.5 $ * - * last change: $Author: fs $ $Date: 2000-10-30 15:36:51 $ + * last change: $Author: oj $ $Date: 2001-01-10 12:09:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,10 +88,23 @@ #define ODBC_UI_LIBRARY "libodbc.so" #endif +// just to go with calling convention of windows +// so don't touch this +#if defined(WIN) || defined(WNT) +#define SQL_API __stdcall +#endif // defined(WIN) || defined(WNT) + #ifndef __SQLEXT_H #include <odbc/sqlext.h> #endif +#if defined(WIN) || defined(WNT) +#undef SQL_API +#define SQL_API __stdcall +#endif // defined(WIN) || defined(WNT) +// from here on you can do what you want to + + #else #define ODBC_LIBRARY "" @@ -104,6 +117,7 @@ namespace dbaui { //......................................................................... + #ifdef HAVE_ODBC_SUPPORT typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); @@ -322,6 +336,9 @@ void OOdbcManagement::manageDataSources(void* _pParentSysWindowHandle) /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.4 2000/10/30 15:36:51 fs + * don't append the description of the ODBC data source to the DSN name + * * Revision 1.3 2000/10/26 13:47:46 kz * chg. cast & ifdef WIN * |