From d843802120e7cb01659b93917c29e3ba014216f1 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 9 Mar 2023 01:50:01 +0000 Subject: my_fileno: drop Ruby 1.8 support and simplify This project has been 1.9.3+ only for a long time (and likely going 2.x+-only), so kill some code we don't need. --- ext/raindrops/my_fileno.h | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/ext/raindrops/my_fileno.h b/ext/raindrops/my_fileno.h index bdf1a5f..4c8ffba 100644 --- a/ext/raindrops/my_fileno.h +++ b/ext/raindrops/my_fileno.h @@ -1,36 +1,15 @@ #include -#ifdef HAVE_RUBY_IO_H -# include -#else -# include -# include -#endif - -#if ! HAVE_RB_IO_T -# define rb_io_t OpenFile -#endif - -#ifdef GetReadFile -# define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr))) -#else -# if !HAVE_RB_IO_T || (RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR == 8) -# define FPTR_TO_FD(fptr) fileno(fptr->f) -# else -# define FPTR_TO_FD(fptr) fptr->fd -# endif -#endif +#include static int my_fileno(VALUE io) { rb_io_t *fptr; - int fd; if (TYPE(io) != T_FILE) io = rb_convert_type(io, T_FILE, "IO", "to_io"); GetOpenFile(io, fptr); - fd = FPTR_TO_FD(fptr); - if (fd < 0) + if (fptr->fd < 0) rb_raise(rb_eIOError, "closed stream"); - return fd; + return fptr->fd; } -- cgit v1.2.3-24-ge0c7