From fb4bea8aaff84adedc4674758ac503d28d30ed0b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 Jan 2009 02:00:52 +0000
Subject: [PATCH] * ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6
 only when   defined, as well as addrinfo_ipv6_p().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  5 +++++
 ext/socket/raddrinfo.c | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97d91c3055..21bf3dff50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 19 11:00:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when
+	  defined, as well as addrinfo_ipv6_p().
+
 Mon Jan 19 10:43:38 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (garbage_collect_with_gvl): suppress warnings.
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index e9785d448b..05cd2b2138 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -1592,8 +1592,14 @@ addrinfo_ip_port(VALUE self)
     int family = ai_get_afamily(rai);
     int port;
 
-    if (!IS_IP_FAMILY(family))
+    if (!IS_IP_FAMILY(family)) {
+      bad_family:
+#ifdef AF_INET6
 	rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
+#else
+	rb_raise(rb_eSocket, "need IPv4 address");
+#endif
+    }
 
     switch (family) {
       case AF_INET:
@@ -1602,14 +1608,16 @@ addrinfo_ip_port(VALUE self)
         port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port);
         break;
 
+#ifdef AF_INET6
       case AF_INET6:
         if (rai->sockaddr_len != sizeof(struct sockaddr_in6))
             rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6");
         port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port);
         break;
+#endif
 
       default:
-	rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
+	goto bad_family;
     }
 
     return INT2NUM(port);