diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-21 11:52:24 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-21 11:52:24 +0000 |
| commit | b9d9ea62b4c8479c95e29ac478d3a39f9008ea5d (patch) | |
| tree | 0a57bcbd0165ce0f65227116fe3414455b723d2f | |
| parent | 5b16ddf5047aa508316e7687fafd1e4870f2d687 (diff) | |
revert r32183
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/ruby/intern.h | 1 | ||||
| -rw-r--r-- | internal.h | 1 |
3 files changed, 1 insertions, 8 deletions
@@ -2,13 +2,6 @@ Tue Jun 21 20:38:47 2011 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c (datetime_s_*): canonicalize 24 o'clock. -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. [ruby-dev:43698] - * 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 c8b0e1af57..582fa8801d 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -806,6 +806,7 @@ 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 6631a81e9f..c242f450e3 100644 --- a/internal.h +++ b/internal.h @@ -159,7 +159,6 @@ 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); |