Merge branch 'master' into progsig-rebase

2015-10-01 20:57:10 +01:00
parent ad4f4525f3 12b35b301c
commit 41a818cb7d
97 changed files with 7120 additions and 1063 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