1 files changed, 30 insertions, 60 deletions

diff --git a/spec/ruby/optional/capi/ext/struct_spec.c b/spec/ruby/optional/capi/ext/struct_spec.c
index 8f373d9f48..1c669d153e 100644
--- a/spec/ruby/optional/capi/ext/struct_spec.c
+++ b/spec/ruby/optional/capi/ext/struct_spec.c
@@ -7,41 +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)
-{
+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)
-{
+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,
+static VALUE struct_spec_rb_struct_define(VALUE self, VALUE name,
   VALUE attr1, VALUE attr2, VALUE attr3) {
 
   const char *a1 = StringValuePtr(attr1);
@@ -53,11 +40,9 @@ 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,
+static VALUE struct_spec_rb_struct_define_under(VALUE self, VALUE outer,
   VALUE name, VALUE attr1, VALUE attr2, VALUE attr3) {
 
   const char *nm = StringValuePtr(name);
@@ -67,63 +52,48 @@ 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)
-{
-
+                                       VALUE a, VALUE b, VALUE c) {
   return rb_struct_new(klass, a, b, c);
 }
-#endif
 
-#ifdef HAVE_RB_STRUCT_SIZE
-static VALUE struct_spec_rb_struct_size(VALUE self, VALUE st)
-{
+static VALUE struct_spec_rb_struct_size(VALUE self, VALUE st) {
   return rb_struct_size(st);
 }
-#endif
 
-void Init_struct_spec(void) {
-  VALUE cls;
-  cls = rb_define_class("CApiStructSpecs", rb_cObject);
+static VALUE struct_spec_rb_struct_initialize(VALUE self, VALUE st, VALUE values) {
+  return rb_struct_initialize(st, values);
+}
 
-#ifdef HAVE_RB_STRUCT_AREF
-  rb_define_method(cls, "rb_struct_aref", struct_spec_rb_struct_aref, 2);
-#endif
+/* Only allow setting three attributes, should be sufficient for testing. */
+static VALUE struct_spec_rb_data_define(VALUE self, VALUE superclass,
+  VALUE attr1, VALUE attr2, VALUE attr3) {
 
-#ifdef HAVE_RB_STRUCT_GETMEMBER
-  rb_define_method(cls, "rb_struct_getmember", struct_spec_rb_struct_getmember, 2);
-#endif
+  const char *a1 = StringValuePtr(attr1);
+  const char *a2 = StringValuePtr(attr2);
+  const char *a3 = StringValuePtr(attr3);
 
-#ifdef HAVE_RB_STRUCT_S_MEMBERS
-  rb_define_method(cls, "rb_struct_s_members", struct_spec_rb_struct_s_members, 1);
-#endif
+  if (superclass == Qnil) {
+    superclass = 0;
+  }
 
-#ifdef HAVE_RB_STRUCT_MEMBERS
-  rb_define_method(cls, "rb_struct_members", struct_spec_rb_struct_members, 1);
-#endif
+  return rb_data_define(superclass, a1, a2, a3, NULL);
+}
 
-#ifdef HAVE_RB_STRUCT_ASET
+void Init_struct_spec(void) {
+  VALUE cls = rb_define_class("CApiStructSpecs", rb_cObject);
+  rb_define_method(cls, "rb_struct_aref", struct_spec_rb_struct_aref, 2);
+  rb_define_method(cls, "rb_struct_getmember", struct_spec_rb_struct_getmember, 2);
+  rb_define_method(cls, "rb_struct_s_members", struct_spec_rb_struct_s_members, 1);
+  rb_define_method(cls, "rb_struct_members", struct_spec_rb_struct_members, 1);
   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_define", struct_spec_rb_struct_define, 4);
+  rb_define_method(cls, "rb_struct_define_under", struct_spec_rb_struct_define_under, 5);
   rb_define_method(cls, "rb_struct_new", struct_spec_rb_struct_new, 4);
-#endif
-
-#ifdef HAVE_RB_STRUCT_SIZE
   rb_define_method(cls, "rb_struct_size", struct_spec_rb_struct_size, 1);
-#endif
+  rb_define_method(cls, "rb_struct_initialize", struct_spec_rb_struct_initialize, 2);
+  rb_define_method(cls, "rb_data_define", struct_spec_rb_data_define, 4);
 }
 
 #ifdef __cplusplus