From 8a8d3e2ed433a7a305253ea2bb6698510b6e1ed6 Mon Sep 17 00:00:00 2001 From: ngoto Date: Fri, 10 Jun 2016 16:47:05 +0000 Subject: [PATCH] * include/ruby/defines.h (GCC_VERSION_SINCE): Fix logic error by adding parentheses. Fix failures of TestMkmf::TestConvertible with GCC 3.4.3 on Solaris 10. [Bug #12479] [ruby-dev:49660] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ include/ruby/defines.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26381ff971..9afaaaaae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 11 01:38:31 2016 Naohisa Goto + + * include/ruby/defines.h (GCC_VERSION_SINCE): Fix logic error by + adding parentheses. Fix failures of TestMkmf::TestConvertible + with GCC 3.4.3 on Solaris 10. [Bug #12479] [ruby-dev:49660] + Fri Jun 10 21:54:24 2016 Nobuyoshi Nakada * lib/forwardable.rb (Forwardable._delegator_method): extract diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 25700165d0..bc0eda29f2 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -63,8 +63,8 @@ extern "C" { (defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && \ ((__GNUC__ > (major)) || \ ((__GNUC__ == (major) && \ - (__GNUC_MINOR__ > (minor)) || \ - (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel)))))) + ((__GNUC_MINOR__ > (minor)) || \ + (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))))) #endif /* likely */