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 | 81ad8ec09648d1d2a591ef481a3fbb7cade260eb (patch) | |
| tree | 2f9b78eb64016c9318ce42d810fcc78416a98e56 | |
| parent | aee718d32a0ef6b47a7dc3bd70e61916f5c71be2 (diff) | |
| download | ruby-81ad8ec09648d1d2a591ef481a3fbb7cade260eb.tar.gz | |
* 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/trunk@8806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/socket/socket.c | 5 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Wed Jul 20 03:58:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET, + so reverted. + + * ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET + on windows. + Wed Jul 20 03:12:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/socket/socket.c: should not undef close() on win32. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 747bb35296..b14fa8efbf 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -4,7 +4,6 @@ case RUBY_PLATFORM when /(ms|bcc)win32|mingw/ test_func = "WSACleanup" have_library("ws2_32", "WSACleanup") - have_func("closesocket") when /cygwin/ test_func = "socket" when /beos/ diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 096a4e8894..b512839626 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -193,6 +193,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; |