From 5de704050afe243fe73e9744e8178e3af250606b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 30 Jan 2016 16:39:54 -0800 Subject: [PATCH] Fixing VS2010 build. --- 3rdparty/dxsdk/include/d3dcommon.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/3rdparty/dxsdk/include/d3dcommon.h b/3rdparty/dxsdk/include/d3dcommon.h index b263f3302..7daa83b36 100644 --- a/3rdparty/dxsdk/include/d3dcommon.h +++ b/3rdparty/dxsdk/include/d3dcommon.h @@ -37,11 +37,12 @@ #pragma once #endif -#if defined(_MSC_VER) && _MSC_VER < 1600 +#if defined(_MSC_VER) && _MSC_VER <= 1600 #ifndef VS2008_SAL_COMPAT #define VS2008_SAL_COMPAT // BK - SAL compatibility for VS2008 +#if _MSC_VER < 1600 #define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) \ extern "C++" { \ inline ENUMTYPE operator | (ENUMTYPE _a, ENUMTYPE _b) { return ENUMTYPE ( ( (int) _a) | ( (int)_b) ); } \ @@ -52,6 +53,7 @@ inline ENUMTYPE operator ^ (ENUMTYPE _a, ENUMTYPE _b) { return ENUMTYPE ( ( (int) _a) ^ ( (int)_b) ); } \ inline ENUMTYPE operator ^= (ENUMTYPE &_a, ENUMTYPE _b) { return (ENUMTYPE &)( ( (int &)_a) ^= ( (int)_b) ); } \ } +#endif // _MSC_VER < 1600 #undef _Out_ #define _Out_