summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzuu <zuu@openttd.org>2014-01-05 10:15:57 +0000
committerzuu <zuu@openttd.org>2014-01-05 10:15:57 +0000
commit998049a618025acd065ced6ca52655601f5ba489 (patch)
tree09401e38392df8f8ba5e9c770e9040e62611ea1c /src
parent4575420dcc347f65609ccc8fbabcd356857fe3e5 (diff)
downloadopenttd-998049a618025acd065ced6ca52655601f5ba489.tar.xz
(svn r26226) -Fix (r26212): Compilation in visual studio 2008 failed
Diffstat (limited to 'src')
-rw-r--r--src/stdafx.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/stdafx.h b/src/stdafx.h
index 30facd337..951ab1c38 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -215,6 +215,11 @@
#pragma warning(disable: 6255) // code analyzer: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead
#pragma warning(disable: 6246) // code analyzer: Local declaration of 'statspec' hides declaration of the same name in outer scope. For additional information, see previous declaration at ...
+ #if (_MSC_VER == 1500) // Addresses item #13 on http://blogs.msdn.com/b/vcblog/archive/2008/08/11/tr1-fixes-in-vc9-sp1.aspx, for Visual Studio 2008
+ #define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
+ #include <intrin.h>
+ #endif
+
#include <malloc.h> // alloca()
#define NORETURN __declspec(noreturn)
#define inline __forceinline