Compiler.h: add macro CLANG_OR_GCC_VERSION()

diff --git a/src/Compiler.h b/src/Compiler.h
index 7d19d686d704072739593e97acc2362b2cdf1266..ef13a546c7666b9211f66cc521d3e3e0243ff219 100644 (file)
--- a/src/Compiler.h
+++ b/src/Compiler.h
@@ -38,6 +38,13 @@
 #  define CLANG_VERSION 0
 #endif
 
 #  define CLANG_VERSION 0
 #endif
 

+/**
+ * Are we building with clang (any version) or at least the specified
+ * gcc version?
+ */
+#define CLANG_OR_GCC_VERSION(major, minor) \
+  (CLANG_VERSION || GCC_CHECK_VERSION(major, minor))
+

 /**
  * Are we building with gcc (not clang or any other compiler) and a
  * version older than the specified one?
 /**
  * Are we building with gcc (not clang or any other compiler) and a
  * version older than the specified one?


@@ -46,7 +53,7 @@
   (GCC_VERSION && !CLANG_VERSION && \
    GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
 
   (GCC_VERSION && !CLANG_VERSION && \
    GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
 

-#if GCC_CHECK_VERSION(4,0)
+#if CLANG_OR_GCC_VERSION(4,0)

 
 /* GCC 4.x */
 
 
 /* GCC 4.x */
 


@@ -106,7 +113,7 @@
 
 #endif
 
 
 #endif
 

-#if GCC_CHECK_VERSION(4,3)
+#if CLANG_OR_GCC_VERSION(4,3)

 
 #define gcc_hot __attribute__((hot))
 #define gcc_cold __attribute__((cold))
 
 #define gcc_hot __attribute__((hot))
 #define gcc_cold __attribute__((cold))


@@ -127,7 +134,7 @@
 #ifndef __cplusplus
 /* plain C99 has "restrict" */
 #define gcc_restrict restrict
 #ifndef __cplusplus
 /* plain C99 has "restrict" */
 #define gcc_restrict restrict

-#elif GCC_CHECK_VERSION(4,0)
+#elif CLANG_OR_GCC_VERSION(4,0)

 /* "__restrict__" is a GCC extension for C++ */
 #define gcc_restrict __restrict__
 #else
 /* "__restrict__" is a GCC extension for C++ */
 #define gcc_restrict __restrict__
 #else


@@ -145,7 +152,7 @@
 #define final
 #endif
 
 #define final
 #endif
 

-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
+#if CLANG_OR_GCC_VERSION(4,8)

 #define gcc_alignas(T, fallback) alignas(T)
 #else
 #define gcc_alignas(T, fallback) gcc_aligned(fallback)
 #define gcc_alignas(T, fallback) alignas(T)
 #else
 #define gcc_alignas(T, fallback) gcc_aligned(fallback)