diff options
| author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-20 20:38:57 +0000 |
|---|---|---|
| committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-20 20:38:57 +0000 |
| commit | 6204e0804b24f1675b49d5880da014411bcfb831 (patch) | |
| tree | ce6c00bf078fc416936ca3cdc972b9b3c1c78dae /spec/ruby/optional/capi/ext/struct_spec.c | |
| parent | 58573c33e4720315ed27491e31dcc22892e1ce95 (diff) | |
Update to ruby/spec@35a9fba
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/optional/capi/ext/struct_spec.c')
| -rw-r--r-- | spec/ruby/optional/capi/ext/struct_spec.c | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/spec/ruby/optional/capi/ext/struct_spec.c b/spec/ruby/optional/capi/ext/struct_spec.c index 8f373d9f48..b9c3b902bf 100644 --- a/spec/ruby/optional/capi/ext/struct_spec.c +++ b/spec/ruby/optional/capi/ext/struct_spec.c @@ -7,39 +7,28 @@ extern "C" { #endif -#ifdef HAVE_RB_STRUCT_AREF static VALUE struct_spec_rb_struct_aref(VALUE self, VALUE st, VALUE key) { return rb_struct_aref(st, key); } -#endif -#ifdef HAVE_RB_STRUCT_GETMEMBER static VALUE struct_spec_rb_struct_getmember(VALUE self, VALUE st, VALUE key) { return rb_struct_getmember(st, SYM2ID(key)); } -#endif -#ifdef HAVE_RB_STRUCT_S_MEMBERS static VALUE struct_spec_rb_struct_s_members(VALUE self, VALUE klass) { return rb_ary_dup(rb_struct_s_members(klass)); } -#endif -#ifdef HAVE_RB_STRUCT_MEMBERS static VALUE struct_spec_rb_struct_members(VALUE self, VALUE st) { return rb_ary_dup(rb_struct_members(st)); } -#endif -#ifdef HAVE_RB_STRUCT_ASET static VALUE struct_spec_rb_struct_aset(VALUE self, VALUE st, VALUE key, VALUE value) { return rb_struct_aset(st, key, value); } -#endif -#ifdef HAVE_RB_STRUCT_DEFINE /* Only allow setting three attributes, should be sufficient for testing. */ static VALUE struct_spec_struct_define(VALUE self, VALUE name, VALUE attr1, VALUE attr2, VALUE attr3) { @@ -53,9 +42,7 @@ static VALUE struct_spec_struct_define(VALUE self, VALUE name, return rb_struct_define(nm, a1, a2, a3, NULL); } -#endif -#ifdef HAVE_RB_STRUCT_DEFINE_UNDER /* Only allow setting three attributes, should be sufficient for testing. */ static VALUE struct_spec_struct_define_under(VALUE self, VALUE outer, VALUE name, VALUE attr1, VALUE attr2, VALUE attr3) { @@ -67,18 +54,15 @@ static VALUE struct_spec_struct_define_under(VALUE self, VALUE outer, return rb_struct_define_under(outer, nm, a1, a2, a3, NULL); } -#endif -#ifdef HAVE_RB_STRUCT_NEW static VALUE struct_spec_rb_struct_new(VALUE self, VALUE klass, VALUE a, VALUE b, VALUE c) { return rb_struct_new(klass, a, b, c); } -#endif -#ifdef HAVE_RB_STRUCT_SIZE +#ifdef RUBY_VERSION_IS_2_4 static VALUE struct_spec_rb_struct_size(VALUE self, VALUE st) { return rb_struct_size(st); @@ -86,42 +70,16 @@ static VALUE struct_spec_rb_struct_size(VALUE self, VALUE st) #endif void Init_struct_spec(void) { - VALUE cls; - cls = rb_define_class("CApiStructSpecs", rb_cObject); - -#ifdef HAVE_RB_STRUCT_AREF + VALUE cls = rb_define_class("CApiStructSpecs", rb_cObject); rb_define_method(cls, "rb_struct_aref", struct_spec_rb_struct_aref, 2); -#endif - -#ifdef HAVE_RB_STRUCT_GETMEMBER rb_define_method(cls, "rb_struct_getmember", struct_spec_rb_struct_getmember, 2); -#endif - -#ifdef HAVE_RB_STRUCT_S_MEMBERS rb_define_method(cls, "rb_struct_s_members", struct_spec_rb_struct_s_members, 1); -#endif - -#ifdef HAVE_RB_STRUCT_MEMBERS rb_define_method(cls, "rb_struct_members", struct_spec_rb_struct_members, 1); -#endif - -#ifdef HAVE_RB_STRUCT_ASET rb_define_method(cls, "rb_struct_aset", struct_spec_rb_struct_aset, 3); -#endif - -#ifdef HAVE_RB_STRUCT_DEFINE rb_define_method(cls, "rb_struct_define", struct_spec_struct_define, 4); -#endif - -#ifdef HAVE_RB_STRUCT_DEFINE_UNDER rb_define_method(cls, "rb_struct_define_under", struct_spec_struct_define_under, 5); -#endif - -#ifdef HAVE_RB_STRUCT_NEW rb_define_method(cls, "rb_struct_new", struct_spec_rb_struct_new, 4); -#endif - -#ifdef HAVE_RB_STRUCT_SIZE +#ifdef RUBY_VERSION_IS_2_4 rb_define_method(cls, "rb_struct_size", struct_spec_rb_struct_size, 1); #endif } |