More cleanups

[SVN r31860]
This commit is contained in:
Douglas Gregor
2005-12-01 15:00:34 +00:00
parent 8d8e621556
commit 77b5ef9227

View File

@@ -1,7 +1,7 @@
// (C) Copyright John Maddock 2001. // (C) Copyright John Maddock 2001.
// (C) Copyright Jens Maurer 2001. // (C) Copyright Jens Maurer 2001.
// Use, modification and distribution are subject to the // Use, modification and distribution are subject to the
// Boost Software License, Version 1.0. (See accompanying file // Boost Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// See http://www.boost.org for most recent version. // See http://www.boost.org for most recent version.
@@ -31,30 +31,30 @@
#ifdef __GLIBCXX__ // gcc 3.4 and greater: #ifdef __GLIBCXX__ // gcc 3.4 and greater:
# if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
|| defined(_GLIBCXX__PTHREADS) || defined(_GLIBCXX__PTHREADS)
// //
// If the std lib has thread support turned on, then turn it on in Boost // If the std lib has thread support turned on, then turn it on in Boost
// as well. We do this because some gcc-3.4 std lib headers define _REENTANT // as well. We do this because some gcc-3.4 std lib headers define _REENTANT
// while others do not... // while others do not...
// //
# define BOOST_HAS_THREADS # define BOOST_HAS_THREADS
# else # else
# define BOOST_DISABLE_THREADS # define BOOST_DISABLE_THREADS
# endif # endif
#elif defined(__GLIBCPP__) \ #elif defined(__GLIBCPP__) \
&& !defined(_GLIBCPP_HAVE_GTHR_DEFAULT) \ && !defined(_GLIBCPP_HAVE_GTHR_DEFAULT) \
&& !defined(_GLIBCPP__PTHREADS) && !defined(_GLIBCPP__PTHREADS)
// disable thread support if the std lib was built single threaded: // disable thread support if the std lib was built single threaded:
# define BOOST_DISABLE_THREADS # define BOOST_DISABLE_THREADS
#endif #endif
#if (defined(linux) || defined(__linux) || defined(__linux__)) && defined(__arm__) && defined(_GLIBCPP_HAVE_GTHR_DEFAULT) #if (defined(linux) || defined(__linux) || defined(__linux__)) && defined(__arm__) && defined(_GLIBCPP_HAVE_GTHR_DEFAULT)
// linux on arm apparently doesn't define _REENTRANT // linux on arm apparently doesn't define _REENTRANT
// so just turn on threading support whenever the std lib is thread safe: // so just turn on threading support whenever the std lib is thread safe:
# define BOOST_HAS_THREADS # define BOOST_HAS_THREADS
#endif #endif
#if !defined(_GLIBCPP_USE_LONG_LONG) \ #if !defined(_GLIBCPP_USE_LONG_LONG) \
&& !defined(_GLIBCXX_USE_LONG_LONG)\ && !defined(_GLIBCXX_USE_LONG_LONG)\
&& defined(BOOST_HAS_LONG_LONG) && defined(BOOST_HAS_LONG_LONG)