diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 04:09:05 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 04:09:05 +0000 |
| commit | 48dc3f0ac72847a20eab4d2532568229ed0cbbc7 (patch) | |
| tree | 931fc3d39d191eaa0842633e028a1de0ebc1b480 | |
| parent | 81d5b6b07d678cbe433a78ac98ba5b80aada14fd (diff) | |
| download | ruby-48dc3f0ac72847a20eab4d2532568229ed0cbbc7.tar.gz ruby-48dc3f0ac72847a20eab4d2532568229ed0cbbc7.tar.xz ruby-48dc3f0ac72847a20eab4d2532568229ed0cbbc7.zip | |
* ext/socket/extconf.rb (gai_strerror): checks if available and if
returns const pointer.
* ext/socket/getaddrinfo.c (gai_strerror): defines only if non
available. [ruby-core:21328]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 13 | ||||
| -rw-r--r-- | ext/socket/getaddrinfo.c | 7 |
3 files changed, 26 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Wed Jan 14 13:09:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/extconf.rb (gai_strerror): checks if available and if + returns const pointer. + + * ext/socket/getaddrinfo.c (gai_strerror): defines only if non + available. [ruby-core:21328] + Wed Jan 14 12:39:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 443dd7d21..4d9f4e43a 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -255,6 +255,19 @@ unless getaddr_info_ok and have_func("getnameinfo", headers) and have_func("geta have_func("inet_ntop") or have_func("inet_ntoa") have_func("inet_pton") or have_func("inet_aton") have_func("getservbyport") + if have_func("gai_strerror") + unless checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)} +#{cpp_include(headers)} +#include <stdlib.h> +void +conftest_gai_strerror_is_const() +{ + *gai_strerror(0) = 0; +} +EOF + $defs << "-DGAI_STRERROR_CONST" + end + end have_header("arpa/nameser.h") have_header("resolv.h") end diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index ef01a607b..53656b4c0 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -39,6 +39,9 @@ */ #include "ruby/config.h" +#ifdef RUBY_EXTCONF_H +#include RUBY_EXTCONF_H +#endif #include <sys/types.h> #ifndef _WIN32 #include <sys/param.h> @@ -195,8 +198,8 @@ if (pai->ai_flags & AI_CANONNAME) {\ #define ERR(err) { error = (err); goto bad; } -#ifndef __HAIKU__ -#if defined __UCLIBC__ +#ifndef HAVE_GAI_STRERROR +#ifdef GAI_STRERROR_CONST const #endif char * |