summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/socket/extconf.rb13
-rw-r--r--ext/socket/getaddrinfo.c7
3 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ac1e2683634..3975b4dc2ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 443dd7d21e5..4d9f4e43a31 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 ef01a607bed..53656b4c02d 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 *