fwd: Enable C89 and C++98 with Clang-CL

lhmouse · Dec 4, 2024 · a601729 · a601729
1 parent b26ef85
commit a601729
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/mcfgthread/fwd.h b/mcfgthread/fwd.h
@@ -84,7 +84,7 @@ __MCF_CXX(extern "C" {)
 #  define __MCF_nullptr   nullptr
 #endif
 
-#if defined __cplusplus && (defined _MSC_VER || (__cplusplus >= 201103L))
+#if defined __cplusplus && ((__cplusplus >= 201103L) || (defined _MSC_VER && !defined __clang__))
 #  undef __MCF_CXX11
 #  define __MCF_CXX11(...)   __VA_ARGS__
 #  undef __MCF_noexcept
@@ -93,7 +93,7 @@ __MCF_CXX(extern "C" {)
 #  define __MCF_nullptr    nullptr
 #endif
 
-#if defined __cplusplus && (defined _MSC_VER || (__cplusplus >= 201402L))
+#if defined __cplusplus && ((__cplusplus >= 201402L) || (defined _MSC_VER && !defined __clang__))
 #  undef __MCF_CXX14
 #  define __MCF_CXX14(...)   __VA_ARGS__
 #endif

diff --git a/test/cxx11_pedantic.cpp b/test/cxx11_pedantic.cpp
@@ -5,13 +5,13 @@
  * LICENSE.TXT as a whole. The GCC Runtime Library Exception applies
  * to this file.  */
 
-#if defined _MSC_VER
+#if defined _MSC_VER  // MSVC standard library doesn't compile as C++11.
 int
 main(void)
   {
     return 77;
   }
-#else  // _MSC_VER
+#else  // MSVC
 
 #include "../mcfgthread/cxx11.hpp"
 
@@ -25,4 +25,4 @@ main(void)
     return 0;
   }
 
-#endif  // _MSC_VER
+#endif  // MSVC
diff --git a/test/gthr_cxx98_pedantic.cpp b/test/gthr_cxx98_pedantic.cpp
@@ -5,13 +5,13 @@
  * LICENSE.TXT as a whole. The GCC Runtime Library Exception applies
  * to this file.  */
 
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined __clang__
 int
 main(void)
   {
     return 77;
   }
-#else  // _MSC_VER
+#else  // MSVC
 
 #include "../mcfgthread/atomic.h"
 #include "../mcfgthread/c11.h"
@@ -42,4 +42,4 @@ main(void)
     return 0;
   }
 
-#endif  // _MSC_VER
+#endif  // MSVC