diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 03:36:05 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 03:36:05 +0000 |
| commit | a60e2e58206c779929a29fe0dd6d73cab4031487 (patch) | |
| tree | 05607e6ff194475f7101fcc192c4fdaa69b6d09e /ext/socket | |
| parent | 0cc9cea3b4606cbb8c51118c447067245b79c68c (diff) | |
| download | ruby-a60e2e58206c779929a29fe0dd6d73cab4031487.tar.gz | |
* ext/socket/extconf.rb: test struct sockaddr_storage directly.
* ext/socket/rubysocket.h: use HAVE_TYPE_STRUCT_SOCKADDR_STORAGE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/socket/rubysocket.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index eff2d3f926..5320db63ad 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -54,6 +54,8 @@ have_header("sys/uio.h") have_header("ucred.h", headers) +have_type("struct sockaddr_storage", headers) + have_type("struct addrinfo", headers) have_type("socklen_t", headers) diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 4ed024208e..50f169823c 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -125,7 +125,7 @@ typedef int socklen_t; # define IN6_IS_ADDR_UNIQUE_LOCAL(a) (((a)->s6_addr[0] == 0xfc) || ((a)->s6_addr[0] == 0xfd)) #endif -#ifndef HAVE_SOCKADDR_STORAGE +#ifndef HAVE_TYPE_STRUCT_SOCKADDR_STORAGE /* * RFC 2553: protocol-independent placeholder for socket addresses */ |