--- boost/units/detail/utility.hpp	(revision 49929)
+++ boost/units/detail/utility.hpp	(working copy)
@@ -21,15 +21,9 @@
 #include <boost/cstdint.hpp>
 #include <boost/limits.hpp>
 
-#if defined(__GNUC__) && defined(__cplusplus) && (__GNUC__ >= 3) && !defined(_RWSTD_VER)
-#define BOOST_UNITS_USE_DEMANGLING
-#endif // __GNUC__
+#if defined(__GLIBCXX__) || defined(__GLIBCPP__)
 
-#ifdef BOOST_UNITS_USE_DEMANGLING
-
-#if (__GNUC__ && __cplusplus && __GNUC__ >= 3)
 #include <cxxabi.h>
-#endif // __GNUC__
 
 #include <boost/algorithm/string/replace.hpp>
 
@@ -88,7 +82,7 @@
 
 } // namespace boost
 
-#else // BOOST_UNITS_USE_DEMANGLING
+#else // __GLIBCXX__
 
 namespace boost {
 
@@ -118,6 +112,6 @@
 // To get system-specific predefined macros:
 // gcc -arch ppc -dM -E - < /dev/null | sort 
 
-#endif // BOOST_UNITS_USE_DEMANGLING
+#endif // __GLIBCXX__
 
 #endif // BOOST_UNITS_UTILITY_HPP