diff options
| author | michi_cc <michi_cc@openttd.org> | 2015-08-10 20:21:29 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2015-08-10 20:21:29 +0000 |
| commit | 35b77450f80580da2aa7f087aa2a1631b92ebd62 (patch) | |
| tree | 375c4648c1566b3cfc715e894764fdd26763e162 /src/stdafx.h | |
| parent | e5d105900ddcb82bc2adf7accb4be010e3b20113 (diff) | |
| download | openttd-35b77450f80580da2aa7f087aa2a1631b92ebd62.tar.xz | |
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
Diffstat (limited to 'src/stdafx.h')
| -rw-r--r-- | src/stdafx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index d68605c19..4616212f1 100644 --- 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 |