diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 4 | ||||
| -rw-r--r-- | ext/socket/mkconstants.rb | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Thu Apr 4 23:24:45 2013 Tanaka Akira <[email protected]> + + * ext/socket/extconf.rb: Remove condition for bcc. + Thu Apr 4 22:53:23 2013 Tanaka Akira <[email protected]> * include/ruby/ruby.h (FIX2LONG): Parenthesize the macro body. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 1e0a3fd0aa..011a110047 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -3,7 +3,7 @@ require 'mkmf' $INCFLAGS << " -I$(topdir) -I$(top_srcdir)" headers = [] -unless $mswin or $bccwin or $mingw +unless $mswin or $mingw headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h> end @@ -63,7 +63,7 @@ have_struct_member('struct msghdr', 'msg_control', headers) unless $mswin or $mi have_struct_member('struct msghdr', 'msg_accrights', headers) case RUBY_PLATFORM -when /(ms|bcc)win(32|64)|mingw/ +when /mswin(32|64)|mingw/ test_func = "WSACleanup" have_library("ws2_32", "WSACleanup", headers) when /cygwin/ diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb index 3b63c39eff..7f8e1193bd 100644 --- a/ext/socket/mkconstants.rb +++ b/ext/socket/mkconstants.rb @@ -63,7 +63,7 @@ def each_const end guard = nil if /\A(AF_INET6|PF_INET6|IPV6_.*)\z/ =~ name - # IPv6 is not supported although AF_INET6 is defined on bcc32/mingw + # IPv6 is not supported although AF_INET6 is defined on mingw guard = "defined(INET6)" end yield guard, make_value, name, default_value |