Tag: cws_src680_mingwport06 User: vg Date: 2007-08-27 12:42:18+0000 Modified: dba/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
Log: #i75499# pragma for MSVC File Changes: Directory: /dba/dbaccess/win32/source/odbcconfig/ ================================================= File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/win32/source/odbcconfig/odbcconfig.cxx?r1=1.2.14.1&r2=1.2.14.2 Delta lines: +6 -3 ------------------- --- odbcconfig.cxx 2007-08-24 14:02:26+0000 1.2.14.1 +++ odbcconfig.cxx 2007-08-27 12:42:15+0000 1.2.14.2 @@ -4,9 +4,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.2.14.1 $ + * $Revision: 1.2.14.2 $ * - * last change: $Author: vg $ $Date: 2007/08/24 14:02:26 $ + * last change: $Author: vg $ $Date: 2007/08/27 12:42:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#pragma once #ifndef __cplusplus #error Need C++ to compile #endif @@ -45,14 +44,18 @@ #define _UNICODE #include <tchar.h> +#ifdef _MSC_VER #pragma warning(push, 1) #pragma warning(disable:4005) +#endif #include <windows.h> #include <shellapi.h> #include <sqlext.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif // the name of the library which contains the SQLManageDataSources function #define ODBC_UI_LIB_NAME L"ODBCCP32.DLL" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
