aboutsummaryrefslogtreecommitdiff
path: root/common/scummsys.h
diff options
context:
space:
mode:
authorPaul Gilbert2015-10-13 19:33:48 -0400
committerPaul Gilbert2015-10-13 19:33:48 -0400
commitaab728802d6292de53dbcc11c9bc862cd3a664cd (patch)
tree2fb887583aef4ee86aee46dfd9a2ddb887829be4 /common/scummsys.h
parentfc6bde8f2388aa39bd976f2e2d7b9daab38c134a (diff)
parentfbcf667b6a57593a2b85622ad1e1380c8aef7210 (diff)
downloadscummvm-rg350-aab728802d6292de53dbcc11c9bc862cd3a664cd.tar.gz
scummvm-rg350-aab728802d6292de53dbcc11c9bc862cd3a664cd.tar.bz2
scummvm-rg350-aab728802d6292de53dbcc11c9bc862cd3a664cd.zip
Merge pull request #617 from dreammaster/msvc_2015
CREATE_PROJECT: Add support for Visual Studio 2015
Diffstat (limited to 'common/scummsys.h')
-rw-r--r--common/scummsys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index 0c4687e03e..b8cf7678a4 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -46,7 +46,7 @@
#if defined(WIN32)
- #ifdef _MSC_VER
+ #if defined(_MSC_VER) && _MSC_VER <= 1800
// FIXME: The placement of the workaround functions for MSVC below
// require us to include stdio.h and stdarg.h for MSVC here. This