From 72e2d4c24fb0edab8f567d5349b784763db97b12 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Wed, 29 Jun 2011 18:00:59 +0000 Subject: [PATCH] Merge missing changes from Trunk. Authorized by Daniel James. [SVN r72800] --- include/boost/config.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config.hpp b/include/boost/config.hpp index 055a2785..f37585eb 100644 --- a/include/boost/config.hpp +++ b/include/boost/config.hpp @@ -36,7 +36,7 @@ #endif // if we don't have a std library config set, try and find one: -#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) +#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) && defined(__cplusplus) # include #endif // if we have a std library config, include it now: