From 276c67407b07b40a9e8f567f03e86479baaa7231 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 20 Dec 2007 15:38:22 +0000
Subject: Fix compilation under MSVC9

svn-id: r29923
---
 common/scummsys.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'common')

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)
-- 
cgit v1.2.3