summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--include/ruby/intern.h1
-rw-r--r--internal.h1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 791d52c15d..720387b8f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 21 19:56:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * internal.h: move rb_thread_io_blocking_region() declaration
+ from intern.h to internal.h. It's still experimental API and
+ need more discussion.
+ * include/ruby/intern.h: ditto.
+
Tue Jun 21 19:46:23 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/ruby/test_thread.rb (TestThread#test_priority): enable
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 582fa8801d..c8b0e1af57 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -806,7 +806,6 @@ void rb_thread_check_ints(void);
int rb_thread_interrupted(VALUE thval);
VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1,
rb_unblock_function_t *ubf, void *data2);
-VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
#define RUBY_UBF_PROCESS ((rb_unblock_function_t *)-1)
VALUE rb_mutex_new(void);
diff --git a/internal.h b/internal.h
index c242f450e3..6631a81e9f 100644
--- a/internal.h
+++ b/internal.h
@@ -159,6 +159,7 @@ void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
void rb_clear_trace_func(void);
VALUE rb_thread_backtrace(VALUE thval);
VALUE rb_get_coverages(void);
+VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
/* thread_pthread.c, thread_win32.c */
void Init_native_thread(void);