mirror of
https://github.com/boostorg/config.git
synced 2025-07-31 21:04:28 +02:00
Merged from Version_1_33_1
[SVN r31949]
This commit is contained in:
@@ -360,3 +360,4 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
#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
|
||||||
@@ -42,8 +42,8 @@
|
|||||||
# 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
|
||||||
|
@@ -31,3 +31,5 @@
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user