User: obo Date: 2006/10/12 06:37:57 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: INTEGRATION: CWS sb59 (1.15.30); FILE MERGED 2006/08/29 11:44:28 sb 1.15.30.1: #i67487# Made code warning-free (wntmsci10). 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.16&r2=1.17 Delta lines: +11 -0 -------------------- --- odbcconfig.cxx 17 Sep 2006 07:10:53 -0000 1.16 +++ odbcconfig.cxx 12 Oct 2006 13:37:54 -0000 1.17 @@ -78,6 +78,14 @@ // so don't touch this #if defined(WIN) || defined(WNT) #define SQL_API __stdcall +// At least under some circumstances, the below #include <odbc/sqlext.h> re- +// defines SQL_API to an empty string, leading to a compiler warning on MSC; to +// not break the current behavior, this is worked around by locally disabling +// that warning: +#if defined _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4005) +#endif #endif // defined(WIN) || defined(WNT) #ifdef SYSTEM_ODBC_HEADERS @@ -89,6 +97,9 @@ #endif #if defined(WIN) || defined(WNT) +#if defined _MSC_VER +#pragma warning(pop) +#endif #undef SQL_API #define SQL_API __stdcall #endif // defined(WIN) || defined(WNT) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
