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 | 32dd2c47a56e9d310be8258ce5ede8470fc5ce93 (patch) | |
| tree | 01f5db3d549547f5781831b9818b7dedc82ce277 | |
| parent | c4d9a1a306d61434f4851a4c08ebc85b3fe04410 (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 | 9 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 31 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Wed Jan 14 13:09:00 2009 Nobuyoshi Nakada <[email protected]> + + * 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] + Tue Jan 13 00:57:56 2009 Tanaka Akira <[email protected]> * ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 3bc82a3a3a..93c395f9f8 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -261,6 +261,19 @@ 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") + 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 43034a3fd8..b5729a4dce 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -39,6 +39,9 @@ */ #include "config.h" +#ifdef RUBY_EXTCONF_H +#include RUBY_EXTCONF_H +#endif #include <sys/types.h> #if !defined(_WIN32) && !defined(__VMS) #include <sys/param.h> @@ -199,7 +202,8 @@ if (pai->ai_flags & AI_CANONNAME) {\ #define ERR(err) { error = (err); goto bad; } -#if defined __UCLIBC__ +#ifndef HAVE_GAI_STRERROR +#ifdef GAI_STRERROR_CONST const #endif char * @@ -210,6 +214,7 @@ gai_strerror(ecode) ecode = EAI_MAX; return (char *)ai_errlist[ecode]; } +#endif void freeaddrinfo(ai) @@ -388,7 +393,7 @@ getaddrinfo(hostname, servname, hints, res) port = htons((unsigned short)atoi(servname)); } else { struct servent *sp; - char *proto; + const char *proto; proto = NULL; switch (pai->ai_socktype) { @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-01-13" +#define RUBY_RELEASE_DATE "2009-01-14" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090113 +#define RUBY_RELEASE_CODE 20090114 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |