From c65953cd0303d6c3315376f228c2ac20a8ad0135 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 26 Mar 2011 06:16:42 +0000 Subject: [PATCH] * ext/socket/getaddrinfo.c: parenthesize macro arguments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/socket/getaddrinfo.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9339bbcbe5..257c09ea81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 26 15:16:09 2011 Tanaka Akira + + * ext/socket/getaddrinfo.c: parenthesize macro arguments. + Sat Mar 26 05:27:34 2011 NARUSE, Yui * ext/date/lib/date/format.rb (DateTime#strftime): removed because diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 3382f00e52..aa966b3c52 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -182,12 +182,12 @@ if (pai->ai_flags & AI_CANONNAME) {\ error = EAI_MEMORY;\ goto free;\ }\ - memcpy(ai, pai, sizeof(struct addrinfo));\ + memcpy((ai), pai, sizeof(struct addrinfo));\ (ai)->ai_addr = (struct sockaddr *)((ai) + 1);\ memset((ai)->ai_addr, 0, (afd)->a_socklen);\ SET_SA_LEN((ai)->ai_addr, (ai)->ai_addrlen = (afd)->a_socklen);\ (ai)->ai_addr->sa_family = (ai)->ai_family = (afd)->a_af;\ - ((struct sockinet *)(ai)->ai_addr)->si_port = port;\ + ((struct sockinet *)(ai)->ai_addr)->si_port = (port);\ p = (char *)((ai)->ai_addr);\ memcpy(p + (afd)->a_off, (addr), (afd)->a_addrlen);\ }