diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:15:58 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:15:58 +0000 |
commit | 85265c18993bbbdd4b0170bfa71cf20f823c3988 (patch) | |
tree | 99e895ef6196ad418c61087770840cff84628fb6 /embedserv | |
parent | 5a3956fe57fa8b7ff722d4847ff9f8f8558e10f4 (diff) |
INTEGRATION: CWS mingwport06 (1.7.10); FILE MERGED
2007/08/24 13:02:45 vg 1.7.10.1: #i75499# pragma is for MSVC
Diffstat (limited to 'embedserv')
-rwxr-xr-x | embedserv/source/embed/esdll.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index 8e4aead532b7..b74cb6905dbf 100755 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx @@ -4,9 +4,9 @@ * * $RCSfile: esdll.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:48:16 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:15:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,10 +50,14 @@ #include "stdafx.h" #include <atlbase.h> +#ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 4710 ) +#endif CComModule _Module; +#ifdef _MSC_VER #pragma warning( pop ) +#endif #include <atlcom.h> BEGIN_OBJECT_MAP(ObjectMap) |