util/Manual: reimplement GCC_CHECK_VERSION() using GCC_MAKE_VERSION()

92eeca3b · Max Kellermann · 2a86554a · 92eeca3b
Commit 92eeca3b authored Nov 28, 2014 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Compiler.h src/Compiler.h +3 -4

No files found.
--- a/src/Compiler.h
+++ b/src/Compiler.h
@@ -22,16 +22,15 @@

 #define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel)

-#define GCC_CHECK_VERSION(major, minor) \
-  (defined(__GNUC__) &&                                                 \
-   (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
-
 #ifdef __GNUC__
 #define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 #else
 #define GCC_VERSION 0
 #endif

+#define GCC_CHECK_VERSION(major, minor) \
+	(defined(__GNUC__) && GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
 #ifdef __clang__
 #  define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
 #  if __clang_major__ < 3