From a3ce60eb3c8bb5c69ab41556398efa8316286477 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 27 Nov 2012 14:41:16 +0200 Subject: We only support MSVC 2008 (_MSC_VER 1500) or later We can drop or simplify many conditionals. Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97 --- vcl/inc/vcl/outdev.hxx | 2 +- vcl/inc/vcl/sysdata.hxx | 4 ++-- vcl/win/source/window/salframe.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 90bfd06db0bd..ce1e7ec55cca 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -769,7 +769,7 @@ public: const Gradient& rGradient, GDIMetaFile& rMtf ); -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); void AddHatchActions( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch, diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index 8a2859d817fc..bf5f337e6d87 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -46,12 +46,12 @@ class UIView; #endif #if defined( WNT ) -#if _MSC_VER >= 1200 +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4201) #endif #include -#if _MSC_VER >= 1200 +#ifdef _MSC_VER #pragma warning(pop) #endif #endif diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 88ae0f15eda7..f2110d54677b 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -54,7 +54,7 @@ #include // Warning in SDK header -#if defined(_MSC_VER) && (_MSC_VER > 1400) +#ifdef _MSC_VER #pragma warning( disable: 4242 4244 ) #endif #include -- cgit