diff options
| author | Filippos Karapetis | 2007-12-20 15:38:22 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-12-20 15:38:22 +0000 |
| commit | 276c67407b07b40a9e8f567f03e86479baaa7231 (patch) | |
| tree | a1db7dc84d4e45d592a5daf8c0504d181dcdf822 /common | |
| parent | 1b285398b3551242828c95101d9baae2a227e887 (diff) | |
| download | scummvm-rg350-276c67407b07b40a9e8f567f03e86479baaa7231.tar.gz scummvm-rg350-276c67407b07b40a9e8f567f03e86479baaa7231.tar.bz2 scummvm-rg350-276c67407b07b40a9e8f567f03e86479baaa7231.zip | |
Fix compilation under MSVC9
svn-id: r29923
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 5366f36e9f..012e169bfc 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -66,7 +66,10 @@ #pragma warning( disable : 4702 ) // turn off "unreachable code" warning #pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning - #define vsnprintf _vsnprintf + // vsnprintf is already defined in Visual Studio 2008 + #if (_MSC_VER < 1500) + #define vsnprintf _vsnprintf + #endif #endif #if !defined(_WIN32_WCE) |