From 925c690a1b777859c2e5d63dbc2806d6a0f79c9c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 24 Jan 2017 08:11:33 +0200
Subject: Redo config as feature test macros

---
 build2/scheduler     | 2 +-
 build2/scheduler.cxx | 2 +-
 build2/utility       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build2/scheduler b/build2/scheduler
index 9810eb9..8416940 100644
--- a/build2/scheduler
+++ b/build2/scheduler
@@ -457,7 +457,7 @@ namespace build2
     // TLS cache of thread's task queue.
     //
     static
-#ifdef BUTL_CXX11_THREAD_LOCAL
+#ifdef __cpp_thread_local
     thread_local
 #else
     __thread
diff --git a/build2/scheduler.cxx b/build2/scheduler.cxx
index 07799dc..be50b28 100644
--- a/build2/scheduler.cxx
+++ b/build2/scheduler.cxx
@@ -390,7 +390,7 @@ namespace build2
     s.helpers_--;
   }
 
-#ifdef BUTL_CXX11_THREAD_LOCAL
+#ifdef __cpp_thread_local
     thread_local
 #else
     __thread
diff --git a/build2/utility b/build2/utility
index b162a9d..08971f1 100644
--- a/build2/utility
+++ b/build2/utility
@@ -13,7 +13,8 @@
 #include <iterator>   // make_move_iterator()
 #include <functional> // ref(), cref()
 
-#include <butl/config>  // BUTL_CXXNN_*
+#include <butl/ft/lang>
+
 #include <butl/utility> // combine_hash(), reverse_iterate(), casecmp(),
                         // lcase(), etc
 
-- 
cgit v1.1