diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-02 19:44:42 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-02 19:44:42 +0000 |
| commit | 79d7c503cd726b7a18a5501208db175706f53073 (patch) | |
| tree | 754107a5cf69600b9f9e2e218425e9ad8a497a63 /ext/socket | |
| parent | 0a66e8ff0bdb3d94e25735fff026f9dd5b29c99b (diff) | |
* ext/socket/extconf.rb: check arpa/inet.h for ntohs.
* ext/socket/socket.c: include arpa/inet.h if available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/extconf.rb | 4 | ||||
| -rw-r--r-- | ext/socket/socket.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 41b715e0af..7a8c153210 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -33,6 +33,9 @@ if /solaris/ =~ RUBY_PLATFORM and !try_compile("") # bug of gcc 3.0 on Solaris 8 ? headers << "sys/feature_tests.h" end +if have_header("arpa/inet.h") + headers << "arpa/inet.h" +end ipv6 = false default_ipv6 = /cygwin/ !~ RUBY_PLATFORM @@ -252,7 +255,6 @@ unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("ge have_func("inet_ntop") or have_func("inet_ntoa") have_func("inet_pton") or have_func("inet_aton") have_func("getservbyport") - have_header("arpa/inet.h") have_header("arpa/nameser.h") have_header("resolv.h") end diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b4f44c9247..89569f9a06 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -42,6 +42,9 @@ #ifdef HAVE_NETINET_UDP_H # include <netinet/udp.h> #endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif #include <netdb.h> #endif #include <errno.h> |