diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 22:08:25 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 22:08:25 +0000 |
| commit | 84a525bc4e47c33c07cc135e6e77df1369375042 (patch) | |
| tree | e3b888062e50a44c84cde1ae46f8540202a97693 /ext/socket/sockport.h | |
| parent | cd63b84ce9199874816833e8023c9b21c3465869 (diff) | |
* ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family
argument. it is always AF_INET.
* ext/socket/raddrinfo.c (make_inetaddr): follow INIT_SOCKADDR_IN
change.
(addrinfo_ipv6_to_ipv4): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/sockport.h')
| -rw-r--r-- | ext/socket/sockport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h index 95f4214d44..8a2567f8aa 100644 --- a/ext/socket/sockport.h +++ b/ext/socket/sockport.h @@ -38,12 +38,12 @@ SET_SA_LEN(init_sockaddr_ptr, init_sockaddr_len); \ } while (0) -#define INIT_SOCKADDR_IN(addr, family, len) \ +#define INIT_SOCKADDR_IN(addr, len) \ do { \ struct sockaddr_in *init_sockaddr_ptr = (addr); \ socklen_t init_sockaddr_len = (len); \ memset(init_sockaddr_ptr, 0, init_sockaddr_len); \ - init_sockaddr_ptr->sin_family = (family); \ + init_sockaddr_ptr->sin_family = AF_INET; \ SET_SIN_LEN(init_sockaddr_ptr, init_sockaddr_len); \ } while (0) |