diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 14:32:21 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 14:32:21 +0000 |
| commit | 31dde2781e8cf3c3ee95517bad306c7b86a983fe (patch) | |
| tree | 6cd0bb723db47a4e46f563f62fe50d4fc6c4bb52 | |
| parent | 4116fe37d9cf8bfd9274649a5d6bc2245aa2991b (diff) | |
| download | ruby-31dde2781e8cf3c3ee95517bad306c7b86a983fe.tar.gz ruby-31dde2781e8cf3c3ee95517bad306c7b86a983fe.tar.xz ruby-31dde2781e8cf3c3ee95517bad306c7b86a983fe.zip | |
* ext/socket/socket.c (IS_IP_FAMILY): defined.
(addrinfo_ip_p): use it.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 13 |
2 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Mon Jan 12 23:31:42 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/socket.c (IS_IP_FAMILY): defined. + (addrinfo_ip_p): use it. + Mon Jan 12 17:23:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/test/unit/assertions.rb (assert_nothing_raised): removes the diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 08276bf8b..afec72e59 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -5106,6 +5106,12 @@ addrinfo_canonname(VALUE self) 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 @@ addrinfo_ip_p(VALUE self) { 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; } /* |