summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/socket/extconf.rb1
-rw-r--r--ext/socket/socket.c5
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c1692e460..7c38f8d84b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;