Merge branch 'tracerestrict' into tracerestrict-sx

2015-08-15 00:32:15 +01:00
parent a48652ac6f 29c4f244f3
commit 6088c7fc24
58 changed files with 6183 additions and 395 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