diff --git a/src/stdafx.h b/src/stdafx.h
index 4616212f18..4ca0a12c30 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -361,21 +361,8 @@ typedef unsigned char byte;
 	#define PERSONAL_DIR ""
 #endif
 
-/* Compile time assertions. Prefer c++0x static_assert().
- * Older compilers cannot evaluate some expressions at compile time,
- * typically when templates are involved, try assert_tcompile() in those cases. */
-#if defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__) || defined(static_assert)
-	/* __STDCXX_VERSION__ is c++0x feature macro, __GXX_EXPERIMENTAL_CXX0X__ is used by gcc, __GXX_EXPERIMENTAL_CPP0X__ by icc */
-	#define assert_compile(expr) static_assert(expr, #expr )
-	#define assert_tcompile(expr) assert_compile(expr)
-#elif defined(__OS2__)
-	/* Disabled for OS/2 */
-	#define assert_compile(expr)
-	#define assert_tcompile(expr) assert_compile(expr)
-#else
-	#define assert_compile(expr) typedef int __ct_assert__[1 - 2 * !(expr)]
-	#define assert_tcompile(expr) assert(expr)
-#endif
+#define assert_compile(expr) static_assert(expr, #expr )
+#define assert_tcompile(expr) assert_compile(expr)
 
 /* Check if the types have the bitsizes like we are using them */
 assert_compile(sizeof(uint64) == 8);