Index: detail/system.hpp
===================================================================
--- detail/system.hpp	(revision 78572)
+++ detail/system.hpp	(working copy)
@@ -6,6 +6,8 @@
 #ifndef BOOST_CHRONO_DETAIL_SYSTEM_HPP
 #define BOOST_CHRONO_DETAIL_SYSTEM_HPP
 
+#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
+
 #include <boost/version.hpp>
 #include <boost/system/error_code.hpp>
 
@@ -15,7 +17,7 @@
 #define BOOST_CHRONO_SYSTEM_CATEGORY boost::system::system_category()
 #endif
 
-#ifdef BOOST_SYSTEM_NO_DEPRECATED 
+#ifdef BOOST_SYSTEM_NO_DEPRECATED
 #define BOOST_CHRONO_THROWS boost::throws()
 #define BOOST_CHRONO_IS_THROWS(EC) (&EC==&boost::throws())
 #else
@@ -24,3 +26,4 @@
 #endif
 
 #endif
+#endif