From c09cd7512491cee1e82c1ad8128ce9fd4bc3f79b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 Sep 2017 23:32:28 +0200
Subject: Initial modularization with both Clang and VC hacks

Note: gave up on VC about half way though.
---
 libbutl/ft/exception.hxx    | 7 +++++--
 libbutl/ft/shared_mutex.hxx | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'libbutl/ft')

diff --git a/libbutl/ft/exception.hxx b/libbutl/ft/exception.hxx
index a5f6156..14d9ced 100644
--- a/libbutl/ft/exception.hxx
+++ b/libbutl/ft/exception.hxx
@@ -5,8 +5,11 @@
 #ifndef LIBBUTL_FT_EXCEPTION_HXX
 #define LIBBUTL_FT_EXCEPTION_HXX
 
-#include <cstddef>   // _LIBCPP_VERSION
-#include <exception>
+#if defined(__clang__)
+#  if __has_include(<__config>)
+#    include <__config>          // _LIBCPP_VERSION
+#  endif
+#endif
 
 // __cpp_lib_uncaught_exceptions
 //
diff --git a/libbutl/ft/shared_mutex.hxx b/libbutl/ft/shared_mutex.hxx
index 6c6d415..a0346fc 100644
--- a/libbutl/ft/shared_mutex.hxx
+++ b/libbutl/ft/shared_mutex.hxx
@@ -5,8 +5,11 @@
 #ifndef LIBBUTL_FT_SHARED_MUTEX_HXX
 #define LIBBUTL_FT_SHARED_MUTEX_HXX
 
-#include <cstddef>      // _LIBCPP_VERSION
-#include <shared_mutex>
+#if defined(__clang__)
+#  if __has_include(<__config>)
+#    include <__config>          // _LIBCPP_VERSION
+#  endif
+#endif
 
 // __cpp_lib_shared_mutex
 //
-- 
cgit v1.1