From 9273a51c1d94b44e290ae7f43cadcd06817acc53 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 1 Sep 2024 12:23:46 +0900 Subject: [PATCH 1/3] Test with ruby 2.6 --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 18a5e3a..f81cbd2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,7 @@ jobs: uses: ruby/actions/.github/workflows/ruby_versions.yml@master with: engine: cruby + min_version: 2.6 # from `required_ruby_version` in io-console.gemspec test: needs: ruby-versions From cad8169568d66ba9b2318e83912be209f6fc762e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 1 Sep 2024 12:29:23 +0900 Subject: [PATCH 2/3] Support older rubies --- ext/io/console/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index e59f5bf..d7f3485 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -1598,14 +1598,14 @@ console_dev_remove(VALUE klass) static ID id_console; -static bool +static int console_dev_get(VALUE klass, VALUE *dev) { if (rb_const_defined(klass, id_console)) { *dev = rb_const_get(klass, id_console); - return true; + return 1; } - return false; + return 0; } static void From 504292b487a9d2e4847ea64254ebf66c5e335191 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 1 Sep 2024 12:37:02 +0900 Subject: [PATCH 3/3] Fix mixing declarations and code for older versions --- ext/io/console/console.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index d7f3485..85e6a06 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -1538,10 +1538,8 @@ console_clear_screen(VALUE io) static VALUE io_open_descriptor_fallback(VALUE klass, int descriptor, int mode, VALUE path, VALUE timeout, void *encoding) { - rb_update_max_fd(descriptor); - VALUE arguments[2] = { - INT2NUM(descriptor), + (rb_update_max_fd(descriptor), INT2NUM(descriptor)), INT2FIX(mode), };