diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-12 07:09:26 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-12 07:09:26 +0000 |
commit | 5aa618819b43af091ab823c2f51bd3fefa20c410 (patch) | |
tree | 4ad86778e7a0af0cb03ee37641f49f1e3223c687 | |
parent | 7da6744329bdebf66fe491c55f32df66e3b7598e (diff) | |
download | ruby-5aa618819b43af091ab823c2f51bd3fefa20c410.tar.gz |
* ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646
check HAVE_TYPE_STRUCT_SOCKADDR_DL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/raddrinfo.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun May 12 16:06:43 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646 + check HAVE_TYPE_STRUCT_SOCKADDR_DL. + Sat May 11 23:01:58 2013 NARUSE, Yui <naruse@ruby-lang.org> * ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL): diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index de89ddaf92..62150218e1 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -1159,7 +1159,7 @@ rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE r } #endif -#ifdef AF_LINK +#if defined(AF_LINK) && defined(HAVE_TYPE_STRUCT_SOCKADDR_DL) /* AF_LINK is defined in 4.4BSD derivations since Net2. link_ntoa is also defined at Net2. However Debian GNU/kFreeBSD defines AF_LINK but |