aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 515f26b55c..776d129350 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 18 11:40:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (RClass): move `__attribute__` after the
+ keyword `struct` for g++. [ruby-core:70297] [Bug #11426]
+
Mon Aug 17 20:56:36 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y: fix syntax error at do-block after a conditional
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index cfc1005919..cbd4044d75 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -825,8 +825,8 @@ struct RObject {
ROBJECT(o)->as.heap.iv_index_tbl)
#define RClass RClassDeprecated
-DEPRECATED_TYPE(("RClass is internal use only"),
-struct RClass {
+struct DEPRECATED_TYPE(("RClass is internal use only"),
+RClass {
struct RBasic basic;
});
#define RCLASS_SUPER(c) rb_class_get_superclass(c)