diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-19 19:04:46 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-19 19:04:46 +0000 |
| commit | 48014442b6e272488ac1df286d86a3dc8040d2b4 (patch) | |
| tree | a8e509b0beb8b1c6713d16ec0fbd4bbcc5899c84 /ext/socket | |
| parent | e7ea44170ee176bb4e6e6ec18d9a8b92f59d2b1e (diff) | |
* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
so reverted.
* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
on windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/socket/socket.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 4c7d32af3b..28f38140b4 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -4,11 +4,9 @@ case RUBY_PLATFORM when /bccwin32/ test_func = "WSACleanup" have_library("ws2_32", "WSACleanup") - have_func("closesocket") when /mswin32|mingw/ test_func = "WSACleanup" have_library("wsock32", "WSACleanup") - have_func("closesocket") when /cygwin/ test_func = "socket" when /beos/ diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 7c6610c144..68ceb284fe 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -197,6 +197,11 @@ ruby_getaddrinfo__aix(nodename, servname, hints, res) #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res)) #endif +#ifdef HAVE_CLOSESOCKET +#undef close +#define close closesocket +#endif + static VALUE init_sock(sock, fd) VALUE sock; |