summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 08:05:06 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 08:05:06 +0000
commita0e7746d78b22585b7f3efd3bc7aa298305c567c (patch)
tree44779092073277e6c3d989fe1e6da6d50d5d2dcb
parent404dda971615ce4ab6ced7ba8eaf0fedd5d29497 (diff)
* ext/io/wait/extconf.rb: check sys/socket.h for cygwin.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/io/wait/extconf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eb3d89b1ed..168343b24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 24 17:04:39 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/io/wait/extconf.rb: check sys/socket.h for cygwin.
+
Tue Jun 24 16:51:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (io_reopen): remove cygwin handling because it seems to be for
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index e8181d25f5..1a0edbd846 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -2,7 +2,7 @@ require 'mkmf'
target = "io/wait"
unless macro_defined?("DOSISH", "#include <ruby.h>")
- fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
+ fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
have_macro("FIONREAD", h)
end
if fionread