From 0f7d3e4e405d17a1ea7db4862a1e6d65e1dfc86e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 18 Apr 2020 16:35:20 +0900 Subject: RUBY_SPECIAL_SHIFT and RUBY_FL_USHIFT are mandatory for rp in lldb_cruby.py --- include/ruby/3/fl_type.h | 2 +- include/ruby/3/special_consts.h | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/ruby/3/fl_type.h b/include/ruby/3/fl_type.h index 2adb6006c7..6366e7037c 100644 --- a/include/ruby/3/fl_type.h +++ b/include/ruby/3/fl_type.h @@ -146,7 +146,7 @@ /** @} */ /* This is an enum because GDB wants it (rather than a macro) */ -enum { RUBY_FL_USHIFT = 12 }; +enum ruby_fl_ushift { RUBY_FL_USHIFT = 12 }; /* > The expression that defines the value of an enumeration constant shall be * > an integer constant expression that has a value representable as an `int`. diff --git a/include/ruby/3/special_consts.h b/include/ruby/3/special_consts.h index 683cebf1ed..3ef7b57a98 100644 --- a/include/ruby/3/special_consts.h +++ b/include/ruby/3/special_consts.h @@ -82,7 +82,7 @@ ruby_special_consts { RUBY_FIXNUM_FLAG = 0x01, /* ...xxxx xxx1 */ RUBY_FLONUM_MASK = 0x03, /* ...0000 0011 */ RUBY_FLONUM_FLAG = 0x02, /* ...xxxx xx10 */ - RUBY_SYMBOL_FLAG = 0x0c /* ...xxxx 1100 */ + RUBY_SYMBOL_FLAG = 0x0c, /* ...xxxx 1100 */ #else RUBY_Qfalse = 0x00, /* ...0000 0000 */ RUBY_Qtrue = 0x02, /* ...0000 0010 */ @@ -92,12 +92,11 @@ ruby_special_consts { RUBY_FIXNUM_FLAG = 0x01, /* ...xxxx xxx1 */ RUBY_FLONUM_MASK = 0x00, /* any values ANDed with FLONUM_MASK cannot be FLONUM_FLAG */ RUBY_FLONUM_FLAG = 0x02, /* ...0000 0010 */ - RUBY_SYMBOL_FLAG = 0x0e /* ...0000 1110 */ + RUBY_SYMBOL_FLAG = 0x0e, /* ...0000 1110 */ #endif -}; -/** Least significant 8 bits are reserved. */ -enum { RUBY_SPECIAL_SHIFT = 8 }; + RUBY_SPECIAL_SHIFT = 8 /** Least significant 8 bits are reserved. */ +}; RUBY3_ATTR_CONST() RUBY3_ATTR_CONSTEXPR(CXX11) -- cgit v1.2.3