From 078f8c1af37ae2623a80ca769887664fed5afd95 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 18 Aug 2015 07:16:24 +0000 Subject: ruby.h: define RClass only in C * include/ruby/ruby.h (RClass): define only in C, `__attribute__` between `struct` and the name can't compile with g++. [ruby-core:70297] [Bug #11426] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index cbd4044d75..f0d53b3e11 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -825,10 +825,12 @@ struct RObject { ROBJECT(o)->as.heap.iv_index_tbl) #define RClass RClassDeprecated -struct DEPRECATED_TYPE(("RClass is internal use only"), -RClass { +#ifndef __cplusplus +DEPRECATED_TYPE(("RClass is internal use only"), +struct RClass { struct RBasic basic; }); +#endif #define RCLASS_SUPER(c) rb_class_get_superclass(c) #define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m) #define RMODULE_CONST_TBL(m) RCLASS_CONST_TBL(m) -- cgit v1.2.3