//------------------Normalize codecvt::length---------------------------------//
-#if !defined(__MSL_CPP__) && !defined(__LIBCOMO__) && \
+#if !defined(__MSL_CPP__) && !defined(__LIBCOMO__) && !defined(__clang__) && \
(!defined(BOOST_RWSTD_VER) || BOOST_RWSTD_VER < 0x04010300) && \
(!defined(__MACH__) || !defined(__INTEL_COMPILER))
/**/
#if defined(__LIBCOMO__)
using ::mbstate_t;
-#elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(__BORLANDC__)
+#elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(BOOST_BORLANDC)
using ::mbstate_t;
#elif defined(__SGI_STL_PORT)
#elif defined(BOOST_NO_STDC_NAMESPACE)