diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 20:56:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 20:56:41 +0000 |
| commit | 1069e0f33569071d43dff77bdca1064a8acb1a0f (patch) | |
| tree | 1d91ab9d912a0879c361699000225c0d570429fa /ext/socket/socket.c | |
| parent | 6e4df2896f6b5ca801e330954e4a6dc1eb0fd571 (diff) | |
| download | ruby-1069e0f33569071d43dff77bdca1064a8acb1a0f.tar.gz | |
* ext/socket/extconf.rb: fix for wide-getaddrinfo option.
* ext/socket/addrinfo.c: rename {addr,name}info functions to ensure
those are used on darwin.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -rw-r--r-- | ext/socket/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index bdc6d16d1c..f45880e366 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -904,7 +904,7 @@ sock_sockaddr(struct sockaddr *addr, size_t len) ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr; len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr); break; -#ifdef INET6 +#ifdef AF_INET6 case AF_INET6: ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr; len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr); @@ -1414,7 +1414,7 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr) static VALUE sockaddr_obj(struct sockaddr *addr) { - socklen_t len; + size_t len; #if defined(AF_INET6) && defined(__KAME__) struct sockaddr_in6 addr6; #endif |