[Scummvm-cvs-logs] SF.net SVN: scummvm: [29923] scummvm/trunk/common/scummsys.h

[thebluegr at users.sourceforge.net]

Revision: 29923
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29923&view=rev
Author:   thebluegr
Date:     2007-12-20 07:38:22 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Fix compilation under MSVC9

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2007-12-20 15:00:09 UTC (rev 29922)
+++ scummvm/trunk/common/scummsys.h	2007-12-20 15:38:22 UTC (rev 29923)
@@ -66,8 +66,11 @@
 		#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)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.