User: kz Date: 2007-09-06 10:26:23+0000 Modified: dba/connectivity/source/inc/odbc/OFunctiondefs.hxx
Log: INTEGRATION: CWS mingwport06 (1.13.12); FILE MERGED 2007/08/24 12:57:05 vg 1.13.12.1: #i75499# pragma is for MSVC 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.13&r2=1.14 Delta lines: +4 -0 ------------------- --- OFunctiondefs.hxx 2007-07-24 11:51:18+0000 1.13 +++ OFunctiondefs.hxx 2007-09-06 10:26:20+0000 1.14 @@ -39,8 +39,10 @@ #if defined(WIN) || defined(WNT) +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4005) +#endif // just to go with calling convention of windows #define SQL_API __stdcall @@ -50,7 +52,9 @@ #undef SQL_API #define SQL_API __stdcall +#ifdef _MSC_VER #pragma warning(pop) +#endif #ifndef SQL_C_BOOKMARK #define SQL_C_BOOKMARK SQL_C_ULONG /* BOOKMARK */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
