From dd58f28978f70eee7152c9a23368a3ed9be7d238 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 11 Feb 2013 16:04:43 +0200 Subject: Fix Boost not to redefine user-defined BOOST_DISABLE_THREADS --- cutl/details/boost/config/stdlib/libstdcpp3.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cutl/details/boost/config/stdlib/libstdcpp3.hpp') diff --git a/cutl/details/boost/config/stdlib/libstdcpp3.hpp b/cutl/details/boost/config/stdlib/libstdcpp3.hpp index c048b89..6127f5f 100644 --- a/cutl/details/boost/config/stdlib/libstdcpp3.hpp +++ b/cutl/details/boost/config/stdlib/libstdcpp3.hpp @@ -41,13 +41,17 @@ // # define BOOST_HAS_THREADS # else -# define BOOST_DISABLE_THREADS +# ifndef BOOST_DISABLE_THREADS +# define BOOST_DISABLE_THREADS +# endif # endif #elif defined(__GLIBCPP__) \ && !defined(_GLIBCPP_HAVE_GTHR_DEFAULT) \ && !defined(_GLIBCPP__PTHREADS) // disable thread support if the std lib was built single threaded: -# define BOOST_DISABLE_THREADS +# ifndef BOOST_DISABLE_THREADS +# define BOOST_DISABLE_THREADS +# endif #endif #if (defined(linux) || defined(__linux) || defined(__linux__)) && defined(__arm__) && defined(_GLIBCPP_HAVE_GTHR_DEFAULT) -- cgit v1.1