diff options
author | Eric Wong <e@yhbt.net> | 2010-10-07 07:14:07 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2010-10-07 07:14:07 +0000 |
commit | 03344bb763f5269afe7fafd56a47270719c7ef9e (patch) | |
tree | c229ece148978db25d74655917f70acfabc0642e | |
parent | 637317eb479525dca543eda7a8977410bc43b832 (diff) | |
download | kgio-03344bb763f5269afe7fafd56a47270719c7ef9e.tar.gz |
Oops, completely broken by the splitting of the code.
-rw-r--r-- | .document | 4 | ||||
-rw-r--r-- | ext/kgio/accept.c | 3 | ||||
-rw-r--r-- | ext/kgio/connect.c | 3 | ||||
-rw-r--r-- | ext/kgio/kgio.h | 8 | ||||
-rw-r--r-- | ext/kgio/kgio_ext.c | 10 | ||||
-rw-r--r-- | ext/kgio/read_write.c | 3 | ||||
-rw-r--r-- | ext/kgio/wait.c | 4 |
7 files changed, 21 insertions, 14 deletions
@@ -6,4 +6,8 @@ ChangeLog ISSUES HACKING lib +ext/kgio/accept.c +ext/kgio/connect.c ext/kgio/kgio_ext.c +ext/kgio/read_write.c +ext/kgio/wait.c diff --git a/ext/kgio/accept.c b/ext/kgio/accept.c index 5ee3313..00a6563 100644 --- a/ext/kgio/accept.c +++ b/ext/kgio/accept.c @@ -341,9 +341,10 @@ static VALUE set_nonblock(VALUE mod, VALUE boolean) return Qnil; } -void init_kgio_accept(VALUE mKgio) +void init_kgio_accept(void) { VALUE cUNIXServer, cTCPServer; + VALUE mKgio = rb_define_module("Kgio"); localhost = rb_const_get(mKgio, rb_intern("LOCALHOST")); cKgio_Socket = rb_const_get(mKgio, rb_intern("Socket")); diff --git a/ext/kgio/connect.c b/ext/kgio/connect.c index 17c77bb..cd9b631 100644 --- a/ext/kgio/connect.c +++ b/ext/kgio/connect.c @@ -223,8 +223,9 @@ static VALUE kgio_start(VALUE klass, VALUE addr) return stream_connect(klass, addr, 0); } -void init_kgio_connect(VALUE mKgio) +void init_kgio_connect(void) { + VALUE mKgio = rb_define_module("Kgio"); VALUE cSocket = rb_const_get(rb_cObject, rb_intern("Socket")); VALUE mSocketMethods = rb_const_get(mKgio, rb_intern("SocketMethods")); VALUE cKgio_Socket, cTCPSocket, cUNIXSocket; diff --git a/ext/kgio/kgio.h b/ext/kgio/kgio.h index 83a247c..0c5b0d8 100644 --- a/ext/kgio/kgio.h +++ b/ext/kgio/kgio.h @@ -29,10 +29,10 @@ struct io_args { int fd; }; -void init_kgio_wait(VALUE mKgio); -void init_kgio_read_write(VALUE mKgio); -void init_kgio_accept(VALUE mKgio); -void init_kgio_connect(VALUE mKgio); +void init_kgio_wait(void); +void init_kgio_read_write(void); +void init_kgio_accept(void); +void init_kgio_connect(void); void kgio_wait_writable(VALUE io, int fd); void kgio_wait_readable(VALUE io, int fd); diff --git a/ext/kgio/kgio_ext.c b/ext/kgio/kgio_ext.c index 12f1c6a..0a457ff 100644 --- a/ext/kgio/kgio_ext.c +++ b/ext/kgio/kgio_ext.c @@ -2,10 +2,8 @@ void Init_kgio_ext(void) { - VALUE mKgio = rb_const_get(rb_cObject, rb_intern("Kgio")); - - init_kgio_wait(mKgio); - init_kgio_read_write(mKgio); - init_kgio_connect(mKgio); - init_kgio_accept(mKgio); + init_kgio_wait(); + init_kgio_read_write(); + init_kgio_connect(); + init_kgio_accept(); } diff --git a/ext/kgio/read_write.c b/ext/kgio/read_write.c index 57fee4e..47160d6 100644 --- a/ext/kgio/read_write.c +++ b/ext/kgio/read_write.c @@ -340,9 +340,10 @@ static VALUE kgio_trysend(VALUE io, VALUE str) # define kgio_trysend kgio_trywrite #endif /* ! USE_MSG_DONTWAIT */ -void init_kgio_read_write(VALUE mKgio) +void init_kgio_read_write(void) { VALUE mPipeMethods, mSocketMethods; + VALUE mKgio = rb_define_module("Kgio"); mKgio_WaitReadable = rb_const_get(mKgio, rb_intern("WaitReadable")); mKgio_WaitWritable = rb_const_get(mKgio, rb_intern("WaitWritable")); diff --git a/ext/kgio/wait.c b/ext/kgio/wait.c index 4fe6d25..d9266eb 100644 --- a/ext/kgio/wait.c +++ b/ext/kgio/wait.c @@ -106,8 +106,10 @@ static VALUE wait_rd(VALUE mod) return io_wait_rd ? ID2SYM(io_wait_rd) : Qnil; } -void init_kgio_wait(VALUE mKgio) +void init_kgio_wait(void) { + VALUE mKgio = rb_define_module("Kgio"); + rb_define_singleton_method(mKgio, "wait_readable=", set_wait_rd, 1); rb_define_singleton_method(mKgio, "wait_writable=", set_wait_wr, 1); rb_define_singleton_method(mKgio, "wait_readable", wait_rd, 0); |