Tag: cws_src680_mingwport06 User: vg Date: 2007-08-24 12:57:08+0000 Modified: dba/connectivity/source/drivers/ado/ado_post_sys_include.h dba/connectivity/source/drivers/ado/ado_pre_sys_include.h dba/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h dba/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h dba/connectivity/source/inc/odbc/OFunctiondefs.hxx
Log: #i75499# pragma is for MSVC File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ado_post_sys_include.h Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ado_post_sys_include.h?r1=1.2&r2=1.2.188.1 Delta lines: +4 -2 ------------------- --- ado_post_sys_include.h 2006-06-20 01:17:13+0000 1.2 +++ ado_post_sys_include.h 2007-08-24 12:57:05+0000 1.2.188.1 @@ -4,9 +4,9 @@ * * $RCSfile: ado_post_sys_include.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.188.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 01:17:13 $ + * last change: $Author: vg $ $Date: 2007/08/24 12:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,4 +35,6 @@ #undef ADO_REDUCED_WARN_LEVEL +#ifdef _MSC_VER #pragma warning(pop) +#endif File [changed]: ado_pre_sys_include.h Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ado_pre_sys_include.h?r1=1.2&r2=1.2.188.1 Delta lines: +4 -2 ------------------- --- ado_pre_sys_include.h 2006-06-20 01:17:22+0000 1.2 +++ ado_pre_sys_include.h 2007-08-24 12:57:05+0000 1.2.188.1 @@ -4,9 +4,9 @@ * * $RCSfile: ado_pre_sys_include.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.188.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 01:17:22 $ + * last change: $Author: vg $ $Date: 2007/08/24 12:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,9 @@ #error "ado_pre_sys_include.h included twice!" #endif +#ifdef _MSC_VER #pragma warning(push,1) #pragma warning(disable:4917) +#endif #define ADO_REDUCED_WARN_LEVEL Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: post_include_windows.h Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h?r1=1.2&r2=1.2.188.1 Delta lines: +3 -3 ------------------- --- post_include_windows.h 2006-06-20 01:50:10+0000 1.2 +++ post_include_windows.h 2007-08-24 12:57:05+0000 1.2.188.1 @@ -4,9 +4,9 @@ * * $RCSfile: post_include_windows.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.188.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 01:50:10 $ + * last change: $Author: vg $ $Date: 2007/08/24 12:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,6 @@ * ************************************************************************/ -#ifdef WNT +#ifdef _MSC_VER #pragma warning(pop) #endif File [changed]: pre_include_windows.h Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h?r1=1.2&r2=1.2.188.1 Delta lines: +3 -3 ------------------- --- pre_include_windows.h 2006-06-20 01:50:21+0000 1.2 +++ pre_include_windows.h 2007-08-24 12:57:05+0000 1.2.188.1 @@ -4,9 +4,9 @@ * * $RCSfile: pre_include_windows.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.188.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 01:50:21 $ + * last change: $Author: vg $ $Date: 2007/08/24 12:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,7 @@ * ************************************************************************/ -#ifdef WNT +#ifdef _MSC_VER #pragma warning(push,1) #pragma warning(disable:4668 4917) #endif 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.13.12.1 Delta lines: +7 -3 ------------------- --- OFunctiondefs.hxx 2007-07-24 11:51:18+0000 1.13 +++ OFunctiondefs.hxx 2007-08-24 12:57:05+0000 1.13.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: OFunctiondefs.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.12.1 $ * - * last change: $Author: rt $ $Date: 2007/07/24 11:51:18 $ + * last change: $Author: vg $ $Date: 2007/08/24 12:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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]
