wreadln: fix #ifdef for WIN32

[ncmpc.git] / src / Compiler.h

diff --git a/src/Compiler.h b/src/Compiler.h
index ef13a546c7666b9211f66cc521d3e3e0243ff219..38c008f4bbe66e515d5366788b4493073cc6a382 100644 (file)
--- a/src/Compiler.h
+++ b/src/Compiler.h
@@ -20,10 +20,6 @@
 #ifndef COMPILER_H
 #define COMPILER_H
 
-#define GCC_CHECK_VERSION(major, minor) \
-  (defined(__GNUC__) &&                                                 \
-   (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
-
 #define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel)
 
 #ifdef __GNUC__
@@ -38,6 +34,14 @@
 #  define CLANG_VERSION 0
 #endif
 
+/**
+ * Are we building with the specified version of gcc (not clang or any
+ * other compiler) or newer?
+ */
+#define GCC_CHECK_VERSION(major, minor) \
+  (!CLANG_VERSION && \
+   GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
 /**
  * Are we building with clang (any version) or at least the specified
  * gcc version?
@@ -125,7 +129,7 @@
 
 #endif /* ! GCC_UNUSED >= 40300 */
 
-#if GCC_CHECK_VERSION(4,6) && !defined(__clang__)
+#if GCC_CHECK_VERSION(4,6)
 #define gcc_flatten __attribute__((flatten))
 #else
 #define gcc_flatten