aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-02-11 16:04:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-02-11 16:04:43 +0200
commitdd58f28978f70eee7152c9a23368a3ed9be7d238 (patch)
treee7cb5c226e105baa866715378f89bc316b95e402
parent16192beb8262828291b0edb8fca44b2c89a5498a (diff)
Fix Boost not to redefine user-defined BOOST_DISABLE_THREADS
-rw-r--r--cutl/details/boost/config/platform/amigaos.hpp4
-rw-r--r--cutl/details/boost/config/platform/hpux.hpp4
-rw-r--r--cutl/details/boost/config/platform/irix.hpp4
-rw-r--r--cutl/details/boost/config/stdlib/libstdcpp3.hpp8
4 files changed, 15 insertions, 5 deletions
diff --git a/cutl/details/boost/config/platform/amigaos.hpp b/cutl/details/boost/config/platform/amigaos.hpp
index 34bcf41..6f3fec4 100644
--- a/cutl/details/boost/config/platform/amigaos.hpp
+++ b/cutl/details/boost/config/platform/amigaos.hpp
@@ -7,7 +7,9 @@
#define BOOST_PLATFORM "AmigaOS"
-#define BOOST_DISABLE_THREADS
+#ifndef BOOST_DISABLE_THREADS
+# define BOOST_DISABLE_THREADS
+#endif
#define BOOST_NO_CWCHAR
#define BOOST_NO_STD_WSTRING
#define BOOST_NO_INTRINSIC_WCHAR_T
diff --git a/cutl/details/boost/config/platform/hpux.hpp b/cutl/details/boost/config/platform/hpux.hpp
index c35faff..84fdfa2 100644
--- a/cutl/details/boost/config/platform/hpux.hpp
+++ b/cutl/details/boost/config/platform/hpux.hpp
@@ -31,7 +31,9 @@
#if defined(__GNUC__)
# if (__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ < 3))
// GNU C on HP-UX does not support threads (checked up to gcc 3.3)
-# define BOOST_DISABLE_THREADS
+# ifndef BOOST_DISABLE_THREADS
+# define BOOST_DISABLE_THREADS
+# endif
# elif !defined(BOOST_DISABLE_THREADS)
// threads supported from gcc-3.3 onwards:
# define BOOST_HAS_THREADS
diff --git a/cutl/details/boost/config/platform/irix.hpp b/cutl/details/boost/config/platform/irix.hpp
index b5ea887..d4add11 100644
--- a/cutl/details/boost/config/platform/irix.hpp
+++ b/cutl/details/boost/config/platform/irix.hpp
@@ -20,7 +20,9 @@
#ifdef __GNUC__
// GNU C on IRIX does not support threads (checked up to gcc 3.3)
-# define BOOST_DISABLE_THREADS
+# ifndef BOOST_DISABLE_THREADS
+# define BOOST_DISABLE_THREADS
+# endif
#endif
// boilerplate code:
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)