summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-26 12:37:42 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-26 12:37:42 +0000
commitd5a93ed10967dac6bc3a55cc0a1bf296b1193c3d (patch)
tree8fbf924eb2320d20c1e8e3cbc2561b58e0ef42f3
parent19f7dd85c4232bf418c3d3ed60463c9355864523 (diff)
fix condition
* include/ruby/defines.h (RUBY_ATTR_ALLOC_SIZE): fix condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--include/ruby/defines.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d426a9c80..5c09f89bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 26 21:35:13 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * include/ruby/defines.h (RUBY_ATTR_ALLOC_SIZE): fix condition.
+
Mon May 25 22:35:58 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/redmine-backporter.rb (rel): after the relations is changed,
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index f83ced006c..05a7ddd90d 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -112,7 +112,7 @@ RUBY_SYMBOL_EXPORT_BEGIN
#define xrealloc2 ruby_xrealloc2
#define xfree ruby_xfree
-#if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# define RUBY_ATTR_ALLOC_SIZE(params) __attribute__ ((__alloc_size__ params))
#else
# define RUBY_ATTR_ALLOC_SIZE(params)