(svn r27380) -Fix: [Win32] Compilation with MSVC2015.

2015-08-10 20:21:29 +00:00
parent e5d105900d
commit 35b77450f8
5 changed files with 8 additions and 3 deletions
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -223,7 +223,9 @@

 	#include <malloc.h> // alloca()
 	#define NORETURN __declspec(noreturn)
-	#define inline __forceinline
+	#if (_MSC_VER < 1900)
+		#define inline __forceinline
+	#endif

 	#if !defined(WINCE)
 		#define CDECL _cdecl