From dd58f28978f70eee7152c9a23368a3ed9be7d238 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 11 Feb 2013 16:04:43 +0200
Subject: Fix Boost not to redefine user-defined BOOST_DISABLE_THREADS

---
 cutl/details/boost/config/platform/amigaos.hpp  | 4 +++-
 cutl/details/boost/config/platform/hpux.hpp     | 4 +++-
 cutl/details/boost/config/platform/irix.hpp     | 4 +++-
 cutl/details/boost/config/stdlib/libstdcpp3.hpp | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'cutl/details/boost/config')

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)
-- 
cgit v1.1