From a3ce60eb3c8bb5c69ab41556398efa8316286477 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
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
---
 dtrans/source/win32/dtobj/DOTransferable.cxx | 5 -----
 dtrans/source/win32/dtobj/DataFmtTransl.cxx  | 3 ---
 2 files changed, 8 deletions(-)

(limited to 'dtrans')

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 003a02ab2c63..15f8fb9d9d79 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -30,11 +30,6 @@
 #include "FmtFilter.hxx"
 #include "Fetc.hxx"
 
-
-#if(_MSC_VER < 1300) && !defined(__MINGW32__)
-#include <olestd.h>
-#endif
-
 #define STR2(x) #x
 #define STR(x) STR2(x)
 #define PRAGMA_MSG( msg ) message( __FILE__ "(" STR(__LINE__) "): " #msg )
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index a990b70f543f..c3ba9624e90a 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -33,9 +33,6 @@
 #pragma warning(disable:4917)
 #endif
 #include <windows.h>
-#if (_MSC_VER < 1300) && !defined(__MINGW32__)
-#include <olestd.h>
-#endif
 #include <shlobj.h>
 #if defined _MSC_VER
 #pragma warning(pop)
-- 
cgit v1.2.3