diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 13:48:50 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 13:48:50 +0000 |
| commit | 0a8d53e84ed41efece722de067cef4d131703590 (patch) | |
| tree | f1a2397e8ce21633224dd16268659b79e2d7c630 /ext | |
| parent | c2ff1696640632a105d2a45d086c2582ce9f5b6b (diff) | |
merge from trunk (r27893)
* ext/socket/extconf.rb: mswin/mingw ruby has socketpair(), but it's
not exist as such name in ruby static library, so mkmf.rb cannot
find it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/extconf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 71deaa218d..7c31030d72 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -4,6 +4,7 @@ case RUBY_PLATFORM when /(ms|bcc)win32|mingw/ test_func = "WSACleanup" have_library("ws2_32", "WSACleanup") + $defs << "-DHAVE_SOCKETPAIR" when /cygwin/ test_func = "socket" when /beos/ @@ -348,7 +349,7 @@ $distcleanfiles << "constants.h" << "constdefs.*" if have_func(test_func) have_func("hsterror") have_func("getipnodebyname") or have_func("gethostbyname2") - have_func("socketpair") + have_func("socketpair") unless $defs.include?("-DHAVE_SOCKETPAIR") unless have_func("gethostname") have_func("uname") end |