diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-20 10:47:53 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-20 10:47:53 +0000 |
| commit | 3453b2bd0e186788bb81deff5d723cf48e10881f (patch) | |
| tree | 329d42bdbd0d45463caf6b6f3c67c9443f9153be /include | |
| parent | d481323b9211cc0823fba407253d0432fa7f1734 (diff) | |
* gc.h, vm_core.h: decl of rb_gc_save_machine_context()
should be at vm_core.h.
* include/ruby/ruby.h, intern.h: remove type rb_thread_t.
* include/ruby/intern.h: change rb_unblock_function_t,
rb_unblock_function_t.
* file.c, process.c: apply above changes.
* thread.c, thread_pthread.ci, thread_win32.ci: ditto.
* io.c: support blocking open (2). [ruby-core:13614]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/intern.h | 5 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/ruby/intern.h b/include/ruby/intern.h index ca6937a42d..dbb9a9b07b 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -543,9 +543,8 @@ VALUE rb_struct_iv_get(VALUE, const char*); VALUE rb_struct_s_members(VALUE); VALUE rb_struct_members(VALUE); /* thread.c */ -typedef struct rb_thread_struct rb_thread_t; -typedef void rb_unblock_function_t(rb_thread_t *, void *); -typedef VALUE rb_blocking_function_t(rb_thread_t *th, void *); +typedef void rb_unblock_function_t(void *); +typedef VALUE rb_blocking_function_t(void *); VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1, rb_unblock_function_t *ubf, void *data2); #define RB_UBF_DFL ((rb_unblock_function_t *)-1) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 581c1957d7..384f7f4f5a 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -963,11 +963,8 @@ typedef struct rb_event_hook_struct { struct rb_event_hook_struct *next; } rb_event_hook_t; -void rb_thread_add_event_hook(rb_thread_t *th, rb_event_hook_func_t func, - rb_event_flag_t events, VALUE data); void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data); -int rb_thread_remove_event_hook(rb_thread_t *th, rb_event_hook_func_t func); int rb_remove_event_hook(rb_event_hook_func_t func); #if defined(__cplusplus) |