diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-27 14:41:16 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-28 20:53:40 +0200 |
commit | a3ce60eb3c8bb5c69ab41556398efa8316286477 (patch) | |
tree | a9600fdf96ab53a1aef150fd9c4a1e8c23b9eb90 /embedserv/source/inc | |
parent | abfe16cec61eae33c64cb1901f0fc740b0466f60 (diff) |
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals.
Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'embedserv/source/inc')
-rw-r--r-- | embedserv/source/inc/embeddoc.hxx | 2 | ||||
-rw-r--r-- | embedserv/source/inc/embeddocaccess.hxx | 2 | ||||
-rw-r--r-- | embedserv/source/inc/iipaobj.hxx | 2 | ||||
-rw-r--r-- | embedserv/source/inc/stdafx.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx index 3eab4a0b4bb1..1962c5451748 100644 --- a/embedserv/source/inc/embeddoc.hxx +++ b/embedserv/source/inc/embeddoc.hxx @@ -19,7 +19,7 @@ #ifndef _EMBEDDOC_HXX_ #define _EMBEDDOC_HXX_ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx index 1b3ff4bd255a..b094ac0b4f8b 100644 --- a/embedserv/source/inc/embeddocaccess.hxx +++ b/embedserv/source/inc/embeddocaccess.hxx @@ -29,7 +29,7 @@ #include <oleidl.h> #ifndef __MINGW32__ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4265) #include <atldbcli.h> #else diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx index 24dd60b3b944..d4f9f8b2eb02 100644 --- a/embedserv/source/inc/iipaobj.hxx +++ b/embedserv/source/inc/iipaobj.hxx @@ -19,7 +19,7 @@ #ifndef _IIPAOBJ_HXX_ #define _IIPAOBJ_HXX_ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h index c1110ac8ab42..d3109ddf9b91 100644 --- a/embedserv/source/inc/stdafx.h +++ b/embedserv/source/inc/stdafx.h @@ -2,9 +2,9 @@ #if !defined(AFX_STDAFX_H_) #define AFX_STDAFX_H_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define STRICT #ifndef _WIN32_WINNT |