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
This commit is contained in:
Kurt Zenker
2007-09-06 12:45:20 +00:00
parent 5c34848813
commit acc3d96f53

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: xception.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -40,7 +40,7 @@
#include <vos/object.hxx> #include <vos/object.hxx>
#endif #endif
#ifdef SAL_W32 #ifdef _MSC_VER
#pragma warning( disable : 4290 ) #pragma warning( disable : 4290 )
#endif #endif