summaryrefslogtreecommitdiff
path: root/dtrans/source/win32
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-11-27 14:41:16 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-11-28 20:53:40 +0200
commita3ce60eb3c8bb5c69ab41556398efa8316286477 (patch)
treea9600fdf96ab53a1aef150fd9c4a1e8c23b9eb90 /dtrans/source/win32
parentabfe16cec61eae33c64cb1901f0fc740b0466f60 (diff)
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals. Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'dtrans/source/win32')
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx5
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.cxx3
2 files changed, 0 insertions, 8 deletions
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)