summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/getaddrinfo.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 049dfad848..61e4069a3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 7 13:12:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/getaddrinfo.c (gai_strerror): ignore only on Haiku.
+ a patch from <znz at mbf.nifty.com>, [ruby-dev:35796].
+
Thu Aug 7 06:31:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
* test/ruby/process.rb (test_popen_fork): skip a test which is
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 0ff2d5f762..da9ba69ccb 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -194,7 +194,7 @@ if (pai->ai_flags & AI_CANONNAME) {\
#define ERR(err) { error = (err); goto bad; }
-/*
+#ifndef __HAIKU__
#if defined __UCLIBC__
const
#endif
@@ -205,7 +205,7 @@ gai_strerror(int ecode)
ecode = EAI_MAX;
return (char *)ai_errlist[ecode];
}
-*/
+#endif
void
freeaddrinfo(struct addrinfo *ai)