Support for rb_io_mode_t (#129)

ioquatix · web-flow · commit 2d3988e12fa2 · 2025-04-15T20:15:26.000+09:00
Companion PR to <ruby/ruby#7894>.
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: false
 require 'mkmf'
 if RUBY_ENGINE == 'ruby'
+ have_type("rb_io_mode_t", "ruby/io.h")
+
 create_makefile('stringio')
 else
 File.write('Makefile', dummy_makefile("").join)
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
@@ -35,12 +35,16 @@ STRINGIO_VERSION = "3.1.6";
 # define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
 #endif
 
+#ifndef HAVE_TYPE_RB_IO_MODE_T
+typedef int rb_io_mode_t;
+#endif
+
 struct StringIO {
 VALUE string;
 rb_encoding *enc;
 long pos;
 long lineno;
- int flags;
+ rb_io_mode_t flags;
 int count;
 };
 
@@ -1852,7 +1856,8 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
 	enc = rb_find_encoding(ext_enc);
 	if (!enc) {
 	 rb_io_enc_t convconfig;
-	 int oflags, fmode;
+	 int oflags;
+	 rb_io_mode_t fmode;
 	 VALUE vmode = rb_str_append(rb_str_new_cstr("r:"), ext_enc);
 	 rb_io_extract_modeenc(&vmode, 0, Qnil, &oflags, &fmode, &convconfig);
 	 enc = convconfig.enc2;

-Original file line number
+Diff line change
@@ @@ -1,6 +1,8 @@ @@
 # frozen_string_literal: false
 require'mkmf'
 ifRUBY_ENGINE == 'ruby'
 +have_type("rb_io_mode_t","ruby/io.h")
++
 create_makefile('stringio')
 else
 File.write('Makefile',dummy_makefile("").join)
-Original file line number
+Diff line change
 # definerb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
 #endif
 +#ifndefHAVE_TYPE_RB_IO_MODE_T
 +typedefintrb_io_mode_t;
 +#endif
++
 structStringIO {
 VALUEstring;
 rb_encoding*enc;
 longpos;
 longlineno;
 -intflags;
 +rb_io_mode_tflags;
 intcount;
 };
 enc=rb_find_encoding(ext_enc);
 if (!enc) {
 rb_io_enc_tconvconfig;
 -intoflags, fmode;
 +intoflags;
 +rb_io_mode_tfmode;
 VALUEvmode=rb_str_append(rb_str_new_cstr("r:"), ext_enc);
 rb_io_extract_modeenc(&vmode, 0, Qnil, &oflags, &fmode, &convconfig);
 enc=convconfig.enc2;