diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-10 16:47:05 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-10 16:47:05 +0000 |
| commit | a3c5ff47c05e8c7583f016b4275351eee1cd060b (patch) | |
| tree | eb4fe0559bc9879fa1bef948a23237178183c4a9 | |
| parent | b061fd1e3fe673fc099306c1151753cd7fc0fbe8 (diff) | |
| download | ruby-a3c5ff47c05e8c7583f016b4275351eee1cd060b.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/ruby/defines.h | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Jun 11 01:38:31 2016 Naohisa Goto <ngotogenome@gmail.com> + + * 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 <nobu@ruby-lang.org> * 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 */ |