diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:45:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:45:20 +0000 |
| commit | acc3d96f53dfa4a937d9b34f62ed97485596397b (patch) | |
| tree | ccce923085a249ed7ede8327ffe09071d86bf188 /vos | |
| parent | 5c3484881378299adb84ebac3fb11c3653a43b88 (diff) | |
INTEGRATION: CWS mingwport06 (1.5.28); FILE MERGED
2007/08/27 11:55:26 vg 1.5.28.2: #i75499# single ifdef for MSVC
2007/08/24 13:28:12 vg 1.5.28.1: #i75499# pragma is for MSVC
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/xception.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vos/inc/vos/xception.hxx b/vos/inc/vos/xception.hxx index 913fc4b03f78..8a95703a1ec2 100644 --- a/vos/inc/vos/xception.hxx +++ b/vos/inc/vos/xception.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xception.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:06:05 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:45:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,7 @@ #include <vos/object.hxx> #endif -#ifdef SAL_W32 +#ifdef _MSC_VER #pragma warning( disable : 4290 ) #endif |