From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS47066 71.19.144.0/20 X-Spam-Status: No, score=-1.9 required=3.0 tests=AWL,BAYES_00, MSGID_FROM_MTA_HEADER shortcircuit=no autolearn=unavailable version=3.3.2 Path: news.gmane.org!not-for-mail From: Eric Wong Newsgroups: gmane.comp.lang.ruby.raindrops.general Subject: [PATCH 2/2] linux_inet_diag: fix Ruby 2.2 (dev) build Date: Tue, 18 Feb 2014 06:55:47 +0000 Message-ID: <1392706547-7978-2-git-send-email-normalperson@yhbt.net> References: <1392706547-7978-1-git-send-email-normalperson@yhbt.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1392706556 23547 80.91.229.3 (18 Feb 2014 06:55:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Feb 2014 06:55:56 +0000 (UTC) To: raindrops@librelist.org Original-X-From: raindrops@librelist.org Tue Feb 18 07:56:04 2014 Return-path: Envelope-to: gclrrg-raindrops@m.gmane.org List-Archive: List-Help: List-Id: List-Post: List-Subscribe: List-Unsubscribe: Precedence: list Original-Sender: raindrops@librelist.org Xref: news.gmane.org gmane.comp.lang.ruby.raindrops.general:135 Archived-At: Received: from zedshaw2.xen.prgmr.com ([71.19.156.177]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WFeb5-0007Ih-Je for gclrrg-raindrops@m.gmane.org; Tue, 18 Feb 2014 07:56:03 +0100 Received: from zedshaw2.xen.prgmr.com (unknown [IPv6:::1]) by zedshaw2.xen.prgmr.com (Postfix) with ESMTP id AB1D074FBC for ; Tue, 18 Feb 2014 07:05:17 +0000 (UTC) Do not define or use rb_thread_blocking_region if rb_thread_io_blocking_region is available. rb_thread_blocking_region is gone entirely in Ruby trunk. --- ext/raindrops/linux_inet_diag.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/raindrops/linux_inet_diag.c b/ext/raindrops/linux_inet_diag.c index 7b5bae1..e4d0fab 100644 --- a/ext/raindrops/linux_inet_diag.c +++ b/ext/raindrops/linux_inet_diag.c @@ -13,7 +13,8 @@ #endif /* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */ -#ifndef HAVE_RB_THREAD_BLOCKING_REGION +#if !defined(HAVE_RB_THREAD_BLOCKING_REGION) && \ + !defined(HAVE_RB_THREAD_IO_BLOCKING_REGION) # include # define RUBY_UBF_IO ((rb_unblock_function_t *)-1) typedef void rb_unblock_function_t(void *); -- 1.9.0.rc3.13.gda73b5f