From 3bdf613a45841156146375383a026d94f0d9b136 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 May 2016 23:35:20 +0000 Subject: defines.h: avoid redefinition * include/ruby/defines.h (GCC_VERSION_SINCE): get rid of re-definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/defines.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ruby/defines.h b/include/ruby/defines.h index dc1df7545a..993caf0479 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -46,12 +46,14 @@ extern "C" { # define NOINLINE(x) x #endif +#ifndef GCC_VERSION_SINCE #define GCC_VERSION_SINCE(major, minor, patchlevel) \ (defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && \ ((__GNUC__ > (major)) || \ ((__GNUC__ == (major) && \ (__GNUC_MINOR__ > (minor)) || \ (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel)))))) +#endif /* likely */ #if __GNUC__ >= 3 -- cgit v1.2.3