From b77f930e712812024c3d379395c2879b312336f8 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 15 Feb 2014 13:13:06 +0000 Subject: [PATCH] avoid deprecated rb_thread_blocking_region in Ruby 2.0/2.1 This will be removed in Ruby 2.2, so avoid the deprecation warning. --- ext/posix_mq/posix_mq.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ext/posix_mq/posix_mq.c b/ext/posix_mq/posix_mq.c index ad8bcff..cbc32b9 100644 --- a/ext/posix_mq/posix_mq.c +++ b/ext/posix_mq/posix_mq.c @@ -95,21 +95,18 @@ static void rb_18_str_set_len(VALUE str, long len) #define rb_str_set_len rb_18_str_set_len #endif /* !defined(HAVE_RB_STR_SET_LEN) */ -/* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */ -#if defined(HAVE_RB_THREAD_BLOCKING_REGION) && \ - defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) -/* - * Ruby 1.9 - 2.1 (we use deprecated rb_thread_blocking_region in 2.0+ - * because we can detect (but not use) rb_thread_blocking_region in 1.9.3 - */ -typedef VALUE(*my_blocking_fn_t)(void*); +#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && defined(HAVE_RUBY_THREAD_H) +/* Ruby 2.0+ */ +# include # define WITHOUT_GVL(fn,a,ubf,b) \ - rb_thread_blocking_region((my_blocking_fn_t)(fn),(a),(ubf),(b)) -#elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) /* Ruby 2.2+ */ -#include + rb_thread_call_without_gvl((fn),(a),(ubf),(b)) +#elif defined(HAVE_RB_THREAD_BLOCKING_REGION) +typedef VALUE (*my_blocking_fn_t)(void*); # define WITHOUT_GVL(fn,a,ubf,b) \ - rb_thread_call_without_gvl((fn),(a),(ubf),(b)) + rb_thread_blocking_region((my_blocking_fn_t)(fn),(a),(ubf),(b)) + #else /* Ruby 1.8 */ +/* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */ # include # define RUBY_UBF_IO ((rb_unblock_function_t *)-1) typedef void rb_unblock_function_t(void *); -- 2.11.4.GIT