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 /sal/systools | |
| parent | Get it to build after the rebase. (diff) | |
| download | core-a3ce60eb3c8bb5c69ab41556398efa8316286477.tar.gz core-a3ce60eb3c8bb5c69ab41556398efa8316286477.zip | |
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals.
Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'sal/systools')
| -rw-r--r-- | sal/systools/win32/uwinapi/legacy.c | 2 | ||||
| -rw-r--r-- | sal/systools/win32/uwinapi/sntprintf.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sal/systools/win32/uwinapi/legacy.c b/sal/systools/win32/uwinapi/legacy.c index 2218d1d77a8a..3a7c54c6dff5 100644 --- a/sal/systools/win32/uwinapi/legacy.c +++ b/sal/systools/win32/uwinapi/legacy.c @@ -25,7 +25,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning(disable:4273) // inconsistent dll linkage #endif diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c index 704c0887fa7a..12eaee9f252d 100644 --- a/sal/systools/win32/uwinapi/sntprintf.c +++ b/sal/systools/win32/uwinapi/sntprintf.c @@ -29,11 +29,11 @@ #include <tchar.h> #include <systools/win32/snprintf.h> -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning(disable:4273) // inconsistent dll linkage #endif -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || (defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18)))) +#if defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18))) /* The non-debug versions of _vscprintf/_scprintf are just calls to _vsprintf/_sprintf with string buffer pointer set to NULL, |