From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3380D1F47D for ; Thu, 9 Mar 2023 01:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1678326601; bh=NSTYv3dFEFexKIblHKfAtygck4/ryT9cSNmadB5aWHw=; h=From:To:Subject:Date:From; b=qyStYBrUImk04RoTn8Lcmsw2yJjiQsUSwWmr6/GjZ0I8YhAFpGYZx1y434m9yE1RK BtJDQxgyT31SqCpvC2NiMJO+xzClsMajo43bSA3l1N7iPIWtwHK3QYUuIjXUAk0ndK TKE1xgeAqKOjdy1ZkTPhVuQmCgoSKJFmj540nvqk= From: Eric Wong To: raindrops-public@yhbt.net Subject: [PATCH] my_fileno: drop Ruby 1.8 support and simplify Date: Thu, 9 Mar 2023 01:50:01 +0000 Message-Id: <20230309015001.1979716-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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; }