From dc806c09b2d099dd66ea92a2d8f3226aaf050e3e Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Tue, 19 Mar 2013 18:36:02 +0000
Subject: [PATCH] Merge config changes from Trunk.

[SVN r83497]
---
 include/boost/config/compiler/visualc.hpp | 2 +-
 include/boost/config/suffix.hpp           | 2 +-
 include/boost/limits.hpp                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index 89c0f050..83beab9a 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -219,7 +219,7 @@
 
 // C++11 features supported by VC++ 11 (aka 2012) November 2012 CTP
 // Because the CTP is unsupported, unrelease, and only alpha quality,
-// it is only supported if BOOST_ENABLE_MSVC_2012_NOV_CTP is defined.
+// it is only supported if BOOST_MSVC_ENABLE_2012_NOV_CTP is defined.
 //
 #if _MSC_FULL_VER < 170051025 || !defined(BOOST_MSVC_ENABLE_2012_NOV_CTP)
 #  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp
index 4dc27fba..d4524812 100644
--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -671,7 +671,7 @@ namespace std{ using ::type_info; }
 #endif
 
 //  Use BOOST_NO_CXX11_HDR_ARRAY instead of BOOST_NO_0X_HDR_ARRAY
-#if defined(BOOST_NO_CXX11_HDR_ARRAY) && !defined(BOOST_NO_BOOST_NO_0X_HDR_ARRAY)
+#if defined(BOOST_NO_CXX11_HDR_ARRAY) && !defined(BOOST_NO_0X_HDR_ARRAY)
 #  define BOOST_NO_0X_HDR_ARRAY
 #endif
 //  Use BOOST_NO_CXX11_HDR_CHRONO instead of BOOST_NO_0X_HDR_CHRONO
diff --git a/include/boost/limits.hpp b/include/boost/limits.hpp
index d3747a1a..47d81556 100644
--- a/include/boost/limits.hpp
+++ b/include/boost/limits.hpp
@@ -14,7 +14,7 @@
 #include <boost/config.hpp>
 
 #ifdef BOOST_NO_LIMITS
-# include <boost/detail/limits.hpp>
+#  error "There is no std::numeric_limits suppport available."
 #else
 # include <limits>
 #endif