diff --git a/include/boost/type_traits/arithmetic_traits.hpp b/include/boost/type_traits/arithmetic_traits.hpp
index 45eed5a..1d111c4 100644
--- a/include/boost/type_traits/arithmetic_traits.hpp
+++ b/include/boost/type_traits/arithmetic_traits.hpp
@@ -66,7 +66,7 @@ template <> struct is_integral<unsigned long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
-#elif (defined(BOOST_MSVC) && (BOOST_MSVC >= 1100)) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520))
+#elif defined(BOOST_HAS_MS_INT64)
 template <> struct is_integral<unsigned __int64>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<__int64>
@@ -126,7 +126,7 @@ template <> struct is_integral<const unsigned long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<const long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
-#elif (defined(BOOST_MSVC) && (BOOST_MSVC >= 1100)) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520))
+#elif defined(BOOST_HAS_MS_INT64)
 template <> struct is_integral<const unsigned __int64>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<const __int64>
@@ -171,7 +171,7 @@ template <> struct is_integral<volatile  unsigned long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<volatile  long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
-#elif (defined(BOOST_MSVC) && (BOOST_MSVC >= 1100)) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520))
+#elif defined(BOOST_HAS_MS_INT64)
 template <> struct is_integral<volatile  unsigned __int64>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<volatile  __int64>
@@ -216,7 +216,7 @@ template <> struct is_integral<const volatile unsigned long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<const volatile long long>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
-#elif (defined(BOOST_MSVC) && (BOOST_MSVC >= 1100)) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520))
+#elif defined(BOOST_HAS_MS_INT64)
 template <> struct is_integral<const volatile unsigned __int64>
 { BOOST_STATIC_CONSTANT(bool, value = true); };
 template <> struct is_integral<const volatile __int64>
diff --git a/tests/arithmetic_traits_test.cpp b/tests/arithmetic_traits_test.cpp
index e3259d9..4e888cc 100644
--- a/tests/arithmetic_traits_test.cpp
+++ b/tests/arithmetic_traits_test.cpp
@@ -59,7 +59,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, boost::is_integral<long long>::value)
    value_test(true, boost::is_integral<unsigned long long>::value)
    #endif
-   #if defined(__BORLANDC__) || defined(_MSC_VER)
+   #if defined(BOOST_HAS_MS_INT64)
    value_test(true, boost::is_integral<__int64>::value)
    value_test(true, boost::is_integral<unsigned __int64>::value)
    #endif
@@ -79,7 +79,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, boost::is_integral<const long long>::value)
    value_test(true, boost::is_integral<const unsigned long long>::value)
    #endif
-   #if defined(__BORLANDC__) || defined(_MSC_VER)
+   #if defined(BOOST_HAS_MS_INT64)
    value_test(true, boost::is_integral<const __int64>::value)
    value_test(true, boost::is_integral<const unsigned __int64>::value)
    #endif
@@ -99,7 +99,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, boost::is_integral<volatile long long>::value)
    value_test(true, boost::is_integral<volatile unsigned long long>::value)
    #endif
-   #if defined(__BORLANDC__) || defined(_MSC_VER)
+   #if defined(BOOST_HAS_MS_INT64)
    value_test(true, boost::is_integral<volatile __int64>::value)
    value_test(true, boost::is_integral<volatile unsigned __int64>::value)
    #endif
@@ -119,7 +119,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, boost::is_integral<const volatile long long>::value)
    value_test(true, boost::is_integral<const volatile unsigned long long>::value)
    #endif
-   #if defined(__BORLANDC__) || defined(_MSC_VER)
+   #if defined(BOOST_HAS_MS_INT64)
    value_test(true, boost::is_integral<const volatile __int64>::value)
    value_test(true, boost::is_integral<const volatile unsigned __int64>::value)
    #endif
@@ -162,7 +162,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, boost::is_arithmetic<long long>::value)
    value_test(true, boost::is_arithmetic<unsigned long long>::value)
    #endif
-   #if defined(__BORLANDC__) || defined(_MSC_VER)
+   #if defined(BOOST_HAS_MS_INT64)
    value_test(true, boost::is_arithmetic<__int64>::value)
    value_test(true, boost::is_arithmetic<unsigned __int64>::value)
    #endif
@@ -189,7 +189,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, boost::is_fundamental<long long>::value)
    value_test(true, boost::is_fundamental<unsigned long long>::value)
    #endif
-   #if defined(__BORLANDC__) || defined(_MSC_VER)
+   #if defined(BOOST_HAS_MS_INT64)
    value_test(true, boost::is_fundamental<__int64>::value)
    value_test(true, boost::is_fundamental<unsigned __int64>::value)
    #endif