diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-26 16:35:07 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-26 16:35:07 +0000 |
| commit | 175ef136db75bd92ccbc8ed4f8af7e22ff5877c9 (patch) | |
| tree | fdd891bdbca39dce02d24116c07d7af381221aa7 | |
| parent | b717f7556f9170491aac304c86e46a2e70f44464 (diff) | |
| download | ruby-175ef136db75bd92ccbc8ed4f8af7e22ff5877c9.tar.gz ruby-175ef136db75bd92ccbc8ed4f8af7e22ff5877c9.tar.xz ruby-175ef136db75bd92ccbc8ed4f8af7e22ff5877c9.zip | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Sep 27 01:30:59 2003 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/socket.c (ruby_connect): on win32, type of the 4th + argument of getsockopt is char *. + Fri Sep 26 18:35:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/resolv-replace.rb: 1.8 compliance. [ruby-talk:82946] 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); |