From 8e2536fc5495bc499e5e58679964b6bc88c3e439 Mon Sep 17 00:00:00 2001
From: "William E. Kempf" <wekempf@cox.net>
Date: Thu, 20 Sep 2001 14:52:42 +0000
Subject: [PATCH] Updated for new config system.

[SVN r11168]
---
 include/boost/thread/condition.hpp       | 2 +-
 include/boost/thread/config.hpp          | 6 ++++--
 include/boost/thread/mutex.hpp           | 2 +-
 include/boost/thread/once.hpp            | 2 +-
 include/boost/thread/recursive_mutex.hpp | 2 +-
 include/boost/thread/semaphore.hpp       | 2 +-
 include/boost/thread/thread.hpp          | 2 +-
 include/boost/thread/tss.hpp             | 2 +-
 include/boost/thread/xtime.hpp           | 2 +-
 src/once.cpp                             | 2 +-
 src/xtime.cpp                            | 1 -
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/boost/thread/condition.hpp b/include/boost/thread/condition.hpp
index 673f8987..d90ffa4b 100644
--- a/include/boost/thread/condition.hpp
+++ b/include/boost/thread/condition.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_CONDITION_WEK070601_HPP
 #define BOOST_CONDITION_WEK070601_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/config.hpp b/include/boost/thread/config.hpp
index f878a4a1..b8cd68c0 100644
--- a/include/boost/thread/config.hpp
+++ b/include/boost/thread/config.hpp
@@ -21,7 +21,9 @@
 
 #include <boost/config.hpp>
 
-// Define if threading support is enabled for the toolset.
+#error "Included <boost/thread/config.hpp>"
+
+/*// Define if threading support is enabled for the toolset.
 #undef BOOST_HAS_THREADS
 
 // Define if threading should be implemented in terms of Win32 threads.
@@ -93,6 +95,6 @@
 #       define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
 #       define BOOST_HAS_PTHREAD_YIELD
 #   endif
-#endif
+#endif*/
 
 #endif // BOOST_THREAD_CONFIG_WEK070601_HPP
diff --git a/include/boost/thread/mutex.hpp b/include/boost/thread/mutex.hpp
index 9a550c5a..4e091797 100644
--- a/include/boost/thread/mutex.hpp
+++ b/include/boost/thread/mutex.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_MUTEX_WEK070601_HPP
 #define BOOST_MUTEX_WEK070601_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/once.hpp b/include/boost/thread/once.hpp
index 1524f2cb..7dd553ff 100644
--- a/include/boost/thread/once.hpp
+++ b/include/boost/thread/once.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_ONCE_WEK080101_HPP
 #define BOOST_ONCE_WEK080101_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/recursive_mutex.hpp b/include/boost/thread/recursive_mutex.hpp
index f1584bd1..ab3a4edc 100644
--- a/include/boost/thread/recursive_mutex.hpp
+++ b/include/boost/thread/recursive_mutex.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_RECURSIVE_MUTEX_WEK070601_HPP
 #define BOOST_RECURSIVE_MUTEX_WEK070601_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/semaphore.hpp b/include/boost/thread/semaphore.hpp
index 1855e691..05111719 100644
--- a/include/boost/thread/semaphore.hpp
+++ b/include/boost/thread/semaphore.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_SEMAPHORE_WEK070601_HPP
 #define BOOST_SEMAPHORE_WEK070601_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/thread.hpp b/include/boost/thread/thread.hpp
index 3f9a9a1a..5fc881dd 100644
--- a/include/boost/thread/thread.hpp
+++ b/include/boost/thread/thread.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_THREAD_WEK070601_HPP
 #define BOOST_THREAD_WEK070601_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/tss.hpp b/include/boost/thread/tss.hpp
index 4aa1236c..07bdfa66 100644
--- a/include/boost/thread/tss.hpp
+++ b/include/boost/thread/tss.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_TSS_WEK070601_HPP
 #define BOOST_TSS_WEK070601_HPP
 
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 #ifndef BOOST_HAS_THREADS
 #   error	Thread support is unavailable!
 #endif
diff --git a/include/boost/thread/xtime.hpp b/include/boost/thread/xtime.hpp
index f5b56ca1..4e10fd7d 100644
--- a/include/boost/thread/xtime.hpp
+++ b/include/boost/thread/xtime.hpp
@@ -13,7 +13,7 @@
 #define BOOST_XTIME_WEK070601_HPP
 
 #include <boost/cstdint.hpp>
-#include <boost/thread/config.hpp>
+#include <boost/config.hpp>
 
 namespace boost {
 
diff --git a/src/once.cpp b/src/once.cpp
index 549385ef..1dcca22f 100644
--- a/src/once.cpp
+++ b/src/once.cpp
@@ -23,7 +23,6 @@ pthread_once_t once = PTHREAD_ONCE_INIT;
 
 typedef void (*once_callback)();
 }
-#endif
 
 extern "C" {
 
@@ -39,6 +38,7 @@ static void do_once()
 }
 
 }
+#endif
 
 namespace boost {
 
diff --git a/src/xtime.cpp b/src/xtime.cpp
index a6ebe862..47bb474b 100644
--- a/src/xtime.cpp
+++ b/src/xtime.cpp
@@ -10,7 +10,6 @@
 // It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/xtime.hpp>
-#include <boost/thread/config.hpp>
 
 #if defined(BOOST_HAS_FTIME)
 #   include <windows.h>