Tag: cws_ood680_os2port01 User: obr Date: 2007-07-18 10:28:46+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: RESYNC: (1.15-1.18); FILE MERGED 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.15.18.1&r2=1.15.18.2 Delta lines: +17 -4 -------------------- --- odbcconfig.cxx 2006-12-28 14:54:08+0000 1.15.18.1 +++ odbcconfig.cxx 2007-07-18 10:28:44+0000 1.15.18.2 @@ -33,6 +33,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbaccess.hxx" + #ifndef _DBAUI_ODBC_CONFIG_HXX_ #include "odbcconfig.hxx" #endif @@ -75,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 @@ -86,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) @@ -340,4 +354,3 @@ //......................................................................... } // namespace dbaui //......................................................................... - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
