diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-12-07 16:47:21 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-12-07 16:47:21 +0000 |
| commit | 93402f1b01620a9fcb369e0955ab984c237b742a (patch) | |
| tree | 0b48f84b341613ecb426ab7052a0b7600ace8680 /ext | |
| parent | f164412f12516837b126d3256eecb9aad4264280 (diff) | |
19991208
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/getaddrinfo.c | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 501ebd5006..ebb03fe959 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -41,11 +41,6 @@ #include <sys/types.h> #ifndef NT #include <sys/param.h> -#endif -#ifdef HAVE_SYSCTL_H -#include <sys/sysctl.h> -#endif -#ifndef NT #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/ext/socket/socket.c b/ext/socket/socket.c index a1d707122e..b38cc48c98 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -16,10 +16,10 @@ #ifndef NT #include <sys/socket.h> #include <netinet/in.h> -#ifdef NETINET_TCP +#ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif -#ifdef NETINET_UDP +#ifdef HAVE_NETINET_UDP_H # include <netinet/udp.h> #endif #include <netdb.h> @@ -890,7 +890,9 @@ tcp_s_gethostbyname(obj, host) struct sockaddr_in6 sin6; MEMZERO(&sin6, struct sockaddr_in6, 1); sin6.sin6_family = AF_INET; +#ifdef SIN6_LEN sin6.sin6_len = sizeof(sin6); +#endif memcpy((char *) &sin6.sin6_addr, *pch, h->h_length); h = gethostbyaddr((char *)&sin6.sin6_addr, sizeof(sin6.sin6_addr), |