aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-15 03:27:05 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-15 03:27:05 +0000
commit0cc9cea3b4606cbb8c51118c447067245b79c68c (patch)
treec77ee938461f392d455787611d69f2bc9ad3963c
parent1ff7108306f63b1f5cc9b0ed2d376f5a1f99bdf4 (diff)
downloadruby-0cc9cea3b4606cbb8c51118c447067245b79c68c.tar.gz
* ext/socket/getaddrinfo.c (GET_AI): don't cast 1st argument for
INIT_SOCKADDR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/getaddrinfo.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21630e8ed5..6951902a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 15 12:26:13 2013 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/getaddrinfo.c (GET_AI): don't cast 1st argument for
+ INIT_SOCKADDR.
+
Fri Feb 15 08:12:11 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/sockport.h (SET_SS_LEN): removed.
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 8704f9aa70..af333f8560 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -186,7 +186,7 @@ if (pai->ai_flags & AI_CANONNAME) {\
(ai)->ai_addr = (struct sockaddr *)((ai) + 1);\
(ai)->ai_family = (afd)->a_af;\
(ai)->ai_addrlen = (afd)->a_socklen;\
- INIT_SOCKADDR((struct sockaddr *)(ai)->ai_addr, (afd)->a_af, (afd)->a_socklen);\
+ INIT_SOCKADDR((ai)->ai_addr, (afd)->a_af, (afd)->a_socklen);\
((struct sockinet *)(ai)->ai_addr)->si_port = (port);\
p = (char *)((ai)->ai_addr);\
memcpy(p + (afd)->a_off, (addr), (afd)->a_addrlen);\