From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 18 Feb 2014 06:48:36 +0000 (+0000)
Subject: linux_inet_diag: fix Ruby 2.2 (dev) build
X-Git-Tag: v0.13.0~2
X-Git-Url: https://repo.or.cz/w/raindrops.git/commitdiff_plain/821b190e39fa48496520eb8f7f782ead8419df58

linux_inet_diag: fix Ruby 2.2 (dev) build

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.
---

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 <rubysig.h>
 #  define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);