diff --git a/include/boost/regex/v4/match_flags.hpp b/include/boost/regex/v4/match_flags.hpp
index 28ad1065..3cd71b83 100644
--- a/include/boost/regex/v4/match_flags.hpp
+++ b/include/boost/regex/v4/match_flags.hpp
@@ -27,6 +27,8 @@
 #  include <boost/cstdint.hpp>
 #endif
 
+#include <boost/detail/workaround.hpp>
+
 #ifdef __cplusplus
 namespace boost{
    namespace regex_constants{
@@ -69,7 +71,7 @@ typedef enum _match_flags
 
 } match_flags;
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1200)
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 typedef unsigned long match_flag_type;
 #else
 typedef match_flags match_flag_type;