From 175ef136db75bd92ccbc8ed4f8af7e22ff5877c9 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 26 Sep 2003 16:35:07 +0000 Subject: * ext/socket/socket.c (ruby_connect): on win32, type of the 4th argument of getsockopt is char *. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 2130d5f53..ca2528f54 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -790,7 +790,7 @@ ruby_connect(fd, sockaddr, len, socks) #endif #if WAIT_IN_PROGRESS > 0 sockerrlen = sizeof(sockerr); - status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &sockerr, &sockerrlen); + status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen); if (status) break; if (sockerr) { status = -1; @@ -816,7 +816,7 @@ ruby_connect(fd, sockaddr, len, socks) * status. */ sockerrlen = sizeof(sockerr); - status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &sockerr, &sockerrlen); + status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen); if (!status && !sockerr) { struct timeval tv = {0, 100000}; rb_thread_wait_for(tv); -- cgit