User: hr Date: 06/06/19 19:05:58 Modified: /dba/connectivity/source/inc/odbc/ OFunctiondefs.hxx
Log: INTEGRATION: CWS warnings01 (1.11.28); FILE MERGED 2005/12/22 11:45:02 fs 1.11.28.2: #i57457# warning-free code 2005/11/21 10:08:00 fs 1.11.28.1: #i57457# warning-free code on unx* File Changes: Directory: /dba/connectivity/source/inc/odbc/ ============================================= File [changed]: OFunctiondefs.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/odbc/OFunctiondefs.hxx?r1=1.11&r2=1.12 Delta lines: +9 -16 -------------------- --- OFunctiondefs.hxx 8 Sep 2005 07:36:28 -0000 1.11 +++ OFunctiondefs.hxx 20 Jun 2006 02:05:55 -0000 1.12 @@ -39,6 +39,9 @@ #if defined(WIN) || defined(WNT) +#pragma warning(push) +#pragma warning(disable:4005) + // just to go with calling convention of windows #define SQL_API __stdcall #ifndef __SQLEXT_H @@ -47,6 +50,7 @@ #undef SQL_API #define SQL_API __stdcall +#pragma warning(pop) #ifndef SQL_C_BOOKMARK #define SQL_C_BOOKMARK SQL_C_ULONG /* BOOKMARK */ @@ -125,15 +129,6 @@ #ifdef UNX -#ifdef ODBCIMP -// Stub-Version: dynamische Bindung an die shared library zur Laufzeit. -// odbcstub definiert die in den Quellen benutzten NSQL...-Methoden -// als indirekte Funktionsaufrufe. -// odbcimp zieht sich selbst preos2, odbc und postos2 an. -// #include "odbc3imp.hxx" - -#else - // Zur Zeit verwenden wir die ODBC-shared library von Q+E direkt (ueber die // mitgelieferte Lib). @@ -150,10 +145,6 @@ #undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal // definiert. -// #include "odbc3defs.hxx" - -#endif // ODBCIMP - #define SDB_ODBC_CHAR UCHAR #define SQL_WCHAR (-8) #define SQL_WVARCHAR (-9) @@ -163,6 +154,8 @@ #endif // UNX +//-------------------------------------------------------------------------- + #ifndef SQL_WCHAR #define SQL_WCHAR (-8) #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
