Prevented #defining for under VS2012.

crabmusket · Sep 23, 2012 · 8876dc06390de461bf9f778cd2cb1468f42484b5 · 8876dc0
1 parent 1a97b0b
commit 8876dc06390de461bf9f778cd2cb1468f42484b5
Showing with 4 additions and 0 deletions.

+2 −0 Engine/source/platform/types.visualc.h

+2 −0 Engine/source/platform/typesWin32.h
diff --git a/Engine/source/platform/types.visualc.h b/Engine/source/platform/types.visualc.h
@@ -88,7 +88,9 @@ typedef unsigned _int64 U64;
 #  define FN_CDECL __cdecl            ///< Calling convention
 #endif
 
+#if _MSC_VER < 1700
 #define for if(false) {} else for   ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping
+#endif
 
 // disable warning caused by memory layer
 // see msdn.microsoft.com "Compiler Warning (level 1) C4291" for more details

diff --git a/Engine/source/platform/typesWin32.h b/Engine/source/platform/typesWin32.h
@@ -116,8 +116,10 @@ static const F32 F32_MAX = F32(3.402823466e+38F);                 ///< Constant
 
 
 #ifdef _MSC_VER
+#if _MSC_VER < 1700
 #define for if(false) {} else for   ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping
 #endif
+#endif
 
 
 #endif //_NTYPES_H_