akr	2009-01-12 23:32:21 +0900 (Mon, 12 Jan 2009)

  New Revision: 21466

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21466

  Log:
    * ext/socket/socket.c (IS_IP_FAMILY): defined.
      (addrinfo_ip_p): use it.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/socket.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21465)
+++ ChangeLog	(revision 21466)
@@ -1,3 +1,8 @@
+Mon Jan 12 23:31:42 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/socket.c (IS_IP_FAMILY): defined.
+	  (addrinfo_ip_p): use it.
+
 Mon Jan 12 17:23:05 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/test/unit/assertions.rb (assert_nothing_raised): removes the
Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 21465)
+++ ext/socket/socket.c	(revision 21466)
@@ -5106,6 +5106,12 @@
     return rai->canonname;
 }
 
+#ifdef AF_INET6
+# define IS_IP_FAMILY(af) ((af) == AF_INET || (af) == AF_INET6)
+#else
+# define IS_IP_FAMILY(af) ((af) == AF_INET)
+#endif
+
 /*
  * call-seq:
  *   addrinfo.ip? => true or false
@@ -5123,12 +5129,7 @@
 {
     rb_addrinfo_t *rai = get_addrinfo(self);
     int family = ai_get_afamily(rai);
-    return family == AF_INET
-#ifdef AF_INET6
-        || family == AF_INET6
-#endif
-        ? Qtrue : Qfalse;
-    return Qfalse;
+    return IS_IP_FAMILY(family) ? Qtrue : Qfalse;
 }
 
 /*

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/