diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-17 04:47:38 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-17 04:47:38 +0000 |
| commit | 17b6e40f9bcd5b06e2a8ec93711d0bb2fbfc3e73 (patch) | |
| tree | 54e9163cdaad71c23ff8d2e1c35346def030cdea /ext/io | |
| parent | a75a039120796960fed626738dbaaee59b3734bf (diff) | |
| download | ruby-17b6e40f9bcd5b06e2a8ec93711d0bb2fbfc3e73.tar.gz ruby-17b6e40f9bcd5b06e2a8ec93711d0bb2fbfc3e73.tar.xz ruby-17b6e40f9bcd5b06e2a8ec93711d0bb2fbfc3e73.zip | |
* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/io')
| -rw-r--r-- | ext/io/wait/extconf.rb | 7 | ||||
| -rw-r--r-- | ext/io/wait/wait.c | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb index ea7dc9f6c..1352ef202 100644 --- a/ext/io/wait/extconf.rb +++ b/ext/io/wait/extconf.rb @@ -3,10 +3,15 @@ target = "io/wait" unless macro_defined?("DOSISH", "#include <ruby.h>") fionread = %w[sys/ioctl.h sys/filio.h].find do |h| - checking_for("FIONREAD") {macro_defined?("FIONREAD", "#include <#{h}>\n")} + checking_for("FIONREAD") {have_macro("FIONREAD", h)} end if fionread $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\"" create_makefile(target) end +else + if have_func("rb_w32_ioctlsocket", "ruby.h") + have_func("rb_w32_is_socket", "ruby.h") + create_makefile(target) + end end diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index 53d5bd7d1..41ba05285 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -15,7 +15,17 @@ #include "rubyio.h" #include <sys/types.h> +#if defined(FIONREAD_HEADER) #include FIONREAD_HEADER +#elif defined(HAVE_RB_W32_IOCTLSOCKET) +#define ioctl ioctlsocket +#endif + +#ifdef HAVE_RB_W32_IS_SOCKET +#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fptr->fd) +#else +#define FIONREAD_POSSIBLE_P(fd) Qtrue +#endif static VALUE io_ready_p _((VALUE io)); static VALUE io_wait _((int argc, VALUE *argv, VALUE io)); @@ -45,6 +55,7 @@ io_ready_p(io) GetOpenFile(io, fptr); rb_io_check_readable(fptr); + if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse; fp = fptr->f; if (feof(fp)) return Qfalse; if (rb_read_pending(fp)) return Qtrue; @@ -98,6 +109,7 @@ io_wait(argc, argv, io) return Qnil; } + if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse; void Init_wait() { |