User: hr Date: 2007-11-02 12:22:08+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: INTEGRATION: CWS os2port02 (1.20.8); FILE MERGED 2007/10/04 19:47:01 ydario 1.20.8.1: Issue number: i82034 Submitted by: ydario Reviewed by: ydario Commit of changes for OS/2 CWS source code integration. File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.cxx?r1=1.21&r2=1.22 Delta lines: +9 -1 ------------------- --- odbcconfig.cxx 2007-10-15 12:36:53+0000 1.21 +++ odbcconfig.cxx 2007-11-02 12:22:06+0000 1.22 @@ -63,7 +63,7 @@ #ifdef HAVE_ODBC_SUPPORT -#ifdef WIN +#if defined(WIN) || defined(OS2) #define ODBC_LIBRARY "ODBC.DLL" #define ODBC_UI_LIBRARY "ODBCINST.DLL" #endif @@ -97,6 +97,11 @@ #endif #endif // defined(WIN) || defined(WNT) +#if defined(OS2) +#define ALLREADY_HAVE_OS2_TYPES +#define DONT_TD_VOID +#endif + #ifdef SYSTEM_ODBC_HEADERS #include <sqlext.h> #else @@ -114,6 +119,9 @@ #endif // defined(WIN) || defined(WNT) // from here on you can do what you want to +#if defined(OS2) +#define SQL_API _System +#endif // defined(OS2) #else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
