diff --git a/appveyor.yml b/appveyor.yml
index aebd80c..aaf2eba 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,11 +18,11 @@ environment:
       TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDRMD: 32,64
       TOOLSET: msvc-12.0,msvc-14.0
+      ADDRMD: 32,64
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
+      TOOLSET: msvc-14.1,clang-win
       ADDRMD: 32,64
       CXXSTD: 14,17
 
diff --git a/include/boost/core/typeinfo.hpp b/include/boost/core/typeinfo.hpp
index a272596..d33d29b 100644
--- a/include/boost/core/typeinfo.hpp
+++ b/include/boost/core/typeinfo.hpp
@@ -47,7 +47,7 @@ public:
 
     bool operator==( typeinfo const& rhs ) const
     {
-#if ( defined(_WIN32) || defined(__CYGWIN__) ) && defined(__GNUC__) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)
+#if ( defined(_WIN32) || defined(__CYGWIN__) ) && ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)
 
         return lib_id_ == rhs.lib_id_? this == &rhs: std::strcmp( name_, rhs.name_ ) == 0;
 
@@ -65,7 +65,7 @@ public:
 
     bool before( typeinfo const& rhs ) const
     {
-#if ( defined(_WIN32) || defined(__CYGWIN__) ) && defined(__GNUC__) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)
+#if ( defined(_WIN32) || defined(__CYGWIN__) ) && ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)
 
         return lib_id_ == rhs.lib_id_? std::less< typeinfo const* >()( this, &rhs ): std::strcmp( name_, rhs.name_ ) < 0;